From: Michael Wallner <mike@php.net>
Date: Tue, 14 Jun 2016 09:26:18 +0000 (+0200)
Subject: clang is picky about these when building in-tree
X-Git-Tag: RELEASE_3_1_0_BETA1~9
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=d5f3f3f2917a257a39a6b8893c6ae203b3dda3df;p=m6w6%2Fext-http

clang is picky about these when building in-tree
---

diff --git a/src/php_http.c b/src/php_http.c
index 3b3338f..c376388 100644
--- 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 b264694..9487612 100644
--- 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 b84bcd0..b214f1d 100644
--- 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 5d2aafe..4e4a0cf 100644
--- 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 1ebddb3..8c6a548 100644
--- 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 4c83028..e105a72 100644
--- 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 cb1192e..591022d 100644
--- 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 d907e80..3ab57f2 100644
--- 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 4adab81..23fb4b5 100644
--- 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 d45cd49..dfda3d5 100644
--- 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 40e98a0..f53accf 100644
--- 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