clang is picky about these when building in-tree

diff --git a/src/php_http.c b/src/php_http.c
index 3b3338f260ad7fabcd92c9d1ad2f37ffe94e3a3f..c37638812a4ba9b7ef3fc8b273ced34a90e5b78a 100644 (file)
--- a/src/php_http.c
+++ b/src/php_http.c
@@ -12,8 +12,8 @@
 
 #include "php_http_api.h"
 
-#include <php_ini.h>
-#include <ext/standard/info.h>
+#include "php_ini.h"
+#include "ext/standard/info.h"
 
 #include <zlib.h>
 

diff --git a/src/php_http_api.h b/src/php_http_api.h
index b26469458b06ca77aed704dbe4c4966dddcec644..94876120f25a97c6fe9588a2f7a56582ffa6c611 100644 (file)
--- a/src/php_http_api.h
+++ b/src/php_http_api.h
@@ -18,19 +18,19 @@
 #endif
 
 #ifndef PHP_WIN32
-#include <php_config.h>
+#include "php_config.h"
 #endif
-#include <php.h>
-#include <SAPI.h>
+#include "php.h"
+#include "SAPI.h"
 
-#include <ext/raphf/php_raphf_api.h>
-#include <ext/propro/php_propro_api.h>
-#include <ext/standard/php_string.h>
-#include <ext/spl/spl_iterators.h>
-#include <ext/date/php_date.h>
+#include "ext/raphf/php_raphf_api.h"
+#include "ext/propro/php_propro_api.h"
+#include "ext/standard/php_string.h"
+#include "ext/spl/spl_iterators.h"
+#include "ext/date/php_date.h"
 
-#include <zend_interfaces.h>
-#include <zend_exceptions.h>
+#include "zend_interfaces.h"
+#include "zend_exceptions.h"
 
 
 #ifdef PHP_WIN32

diff --git a/src/php_http_buffer.c b/src/php_http_buffer.c
index b84bcd0cb37ac247d06b5e7b7591435c02798a67..b214f1d83185db8f345d35e47ca19c02707e7526 100644 (file)
--- a/src/php_http_buffer.c
+++ b/src/php_http_buffer.c
@@ -10,7 +10,7 @@
     +--------------------------------------------------------------------+
 */
 
-#include <php.h>
+#include "php.h"
 #include "php_http_buffer.h"
 
 PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_init_ex(

diff --git a/src/php_http_client.c b/src/php_http_client.c
index 5d2aafe156f1c692c18618a3e2b6d8ea705b75e9..4e4a0cf7889783522ebdf3b62e84f9a6647487a4 100644 (file)
--- a/src/php_http_client.c
+++ b/src/php_http_client.c
@@ -13,7 +13,7 @@
 #include "php_http_api.h"
 #include "php_http_client.h"
 
-#include <ext/spl/spl_observer.h>
+#include "ext/spl/spl_observer.h"
 
 /*
  * array of name => php_http_client_driver_t*

diff --git a/src/php_http_etag.c b/src/php_http_etag.c
index 1ebddb35d4a7b283db6cc07c954133bbbde18c2e..8c6a5485f0bd2a8247d0b0f7c220aba23d803656 100644 (file)
--- a/src/php_http_etag.c
+++ b/src/php_http_etag.c
@@ -16,9 +16,9 @@
 #      include "php_hash.h"
 #endif
 
-#include <ext/standard/crc32.h>
-#include <ext/standard/sha1.h>
-#include <ext/standard/md5.h>
+#include "ext/standard/crc32.h"
+#include "ext/standard/sha1.h"
+#include "ext/standard/md5.h"
 
 php_http_etag_t *php_http_etag_init(const char *mode)
 {

diff --git a/src/php_http_exception.c b/src/php_http_exception.c
index 4c83028af7ec739d817b89d5e2a6285320aa2b3d..e105a72bb6e32d527a20f5ff304df931f0fce005 100644 (file)
--- a/src/php_http_exception.c
+++ b/src/php_http_exception.c
@@ -12,7 +12,7 @@
 
 #include "php_http_api.h"
 
-#include <ext/spl/spl_exceptions.h>
+#include "ext/spl/spl_exceptions.h"
 
 #ifndef PHP_HTTP_DBG_EXCEPTIONS
 #      define PHP_HTTP_DBG_EXCEPTIONS 0

diff --git a/src/php_http_message.c b/src/php_http_message.c
index cb1192e065ab30795c0bc5f15f9a49fc77414407..591022da4f9edd0f5bdca9ca5d1bae398f472967 100644 (file)
--- a/src/php_http_message.c
+++ b/src/php_http_message.c
@@ -1725,7 +1725,7 @@ static PHP_METHOD(HttpMessage, toCallback)
                zend_fcall_info_args_clear(&fcd.fci, 1);
                zval_ptr_dtor(&fcd.fcz);
 
-               RETURN_ZVAL(getThis(), 1, 0);
+               RETURN_ZVAL(&fcd.fcz, 1, 0);
        }
 }
 

diff --git a/src/php_http_message_body.c b/src/php_http_message_body.c
index d907e8033d24354517cc127506f6c98c77aa9224..3ab57f27e4c57f4e8f5a5bfe1650409b038f5030 100644 (file)
--- a/src/php_http_message_body.c
+++ b/src/php_http_message_body.c
@@ -12,7 +12,7 @@
 
 #include "php_http_api.h"
 
-#include <ext/standard/php_lcg.h>
+#include "ext/standard/php_lcg.h"
 
 #define BOUNDARY_OPEN(body) \
        do {\

diff --git a/src/php_http_misc.c b/src/php_http_misc.c
index 4adab8112923c0dd2569b97f02de8c2fe2aa7310..23fb4b553ea28d35bbf51d86768386bbe2a11bff 100644 (file)
--- a/src/php_http_misc.c
+++ b/src/php_http_misc.c
@@ -12,8 +12,8 @@
 
 #include "php_http_api.h"
 
-#include <ext/standard/php_lcg.h>
-#include <zend_exceptions.h>
+#include "ext/standard/php_lcg.h"
+#include "zend_exceptions.h"
 
 /* SLEEP */
 

diff --git a/src/php_http_querystring.c b/src/php_http_querystring.c
index d45cd49923b21ce2b17746ddf0f56b84765b8fc8..dfda3d5e935c0ac74f6b392effb4c45b4379b0a0 100644 (file)
--- a/src/php_http_querystring.c
+++ b/src/php_http_querystring.c
@@ -12,15 +12,15 @@
 
 #include "php_http_api.h"
 
-#include <php_variables.h>
-#include <ext/spl/spl_array.h>
+#include "php_variables.h"
+#include "ext/spl/spl_array.h"
 
 #ifdef PHP_HTTP_HAVE_ICONV
 #      ifndef HAVE_ICONV
 #              define HAVE_ICONV 1
 #      endif
 #      undef PHP_ATOM_INC
-#      include <ext/iconv/php_iconv.h>
+#      include "ext/iconv/php_iconv.h"
 #endif
 
 static zend_class_entry *php_http_querystring_class_entry;

diff --git a/src/php_http_url.h b/src/php_http_url.h
index 40e98a0f3743aaed8d7426dc09311a2441f398ec..f53accf6d09663833ffe2b9a6a917b63fc8359cc 100644 (file)
--- a/src/php_http_url.h
+++ b/src/php_http_url.h
@@ -13,7 +13,7 @@
 #ifndef PHP_HTTP_URL_H
 #define PHP_HTTP_URL_H
 
-#include <ext/standard/url.h>
+#include "ext/standard/url.h"
 
 /* php_http_url_mod() */
 #define PHP_HTTP_URL_REPLACE           0x000