fix some warnings

[m6w6/ext-http] / php_http.h

diff --git a/php_http.h b/php_http.h
index b1bc57c4d6cacca6c9c17e81279e00a04733fb40..4d2b92962ae5063aacd97c46d18544be72989fb3 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -90,7 +90,6 @@ extern void _dpf(int type, const char *data, size_t length);
 #include "php_http_env_response.h"
 #include "php_http_etag.h"
 #include "php_http_exception.h"
-#include "php_http_fluently_callable.h"
 #include "php_http_filter.h"
 #include "php_http_headers.h"
 #include "php_http_info.h"
@@ -128,9 +127,9 @@ ZEND_EXTERN_MODULE_GLOBALS(php_http);
 
 #ifdef ZTS
 #      include "TSRM/TSRM.h"
-#      define PHP_HTTP_G ((php_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(php_http_globals_id)])
+#      define PHP_HTTP_G ((zend_php_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(php_http_globals_id)])
 #      undef TSRMLS_FETCH_FROM_CTX
-#      define TSRMLS_FETCH_FROM_CTX(ctx) ((ctx)?(ctx):ts_resource_ex(0, NULL))
+#      define TSRMLS_FETCH_FROM_CTX(ctx) void ***tsrm_ls = ((ctx)?(ctx):ts_resource_ex(0, NULL))
 #else
 #      define PHP_HTTP_G (&php_http_globals)
 #endif