X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=inline;f=php_http_std_defs.h;h=9ab75e9dbef017743f13eb0a451e187c219ad8af;hb=d83edb65a0097de2d5baa1a9fd9dbcebed34cc79;hp=cfb9cee5504f16e79d8a25b3ce2b1a50a0834991;hpb=61f165688d2cc39424678829a145c8cbab51d1af;p=m6w6%2Fext-http

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index cfb9cee..9ab75e9 100644
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -271,15 +271,16 @@ typedef int STATUS;
 #ifndef E_THROW
 #	define E_THROW 0
 #endif
-#define HE_THROW	E_THROW
 #ifdef ZEND_ENGINE_2
-#	define HE_NOTICE	(HTTP_G(only_exceptions) ? E_THROW : E_NOTICE)
-#	define HE_WARNING	(HTTP_G(only_exceptions) ? E_THROW : E_WARNING)
-#	define HE_ERROR		(HTTP_G(only_exceptions) ? E_THROW : E_ERROR)
+#	define HE_THROW		E_THROW TSRMLS_CC
+#	define HE_NOTICE	(HTTP_G(only_exceptions) ? E_THROW : E_NOTICE) TSRMLS_CC
+#	define HE_WARNING	(HTTP_G(only_exceptions) ? E_THROW : E_WARNING) TSRMLS_CC
+#	define HE_ERROR		(HTTP_G(only_exceptions) ? E_THROW : E_ERROR) TSRMLS_CC
 #else
-#	define HE_NOTICE	E_NOTICE
-#	define HE_WARNING	E_WARNING
-#	define HE_ERROR		E_ERROR
+#	define HE_THROW		E_WARNING TSRMLS_CC
+#	define HE_NOTICE	E_NOTICE TSRMLS_CC
+#	define HE_WARNING	E_WARNING TSRMLS_CC
+#	define HE_ERROR		E_ERROR TSRMLS_CC
 #endif
 
 #define HTTP_E_RUNTIME				1L
@@ -305,6 +306,12 @@ typedef int STATUS;
 #	define HTTP_ARG_OBJ(class, name, allow_null)				ZEND_ARG_OBJ_INFO(1, name, class, allow_null)
 #endif
 
+#ifdef ZEND_ENGINE_2
+#	define EMPTY_FUNCTION_ENTRY {NULL, NULL, NULL, 0}
+#else
+#	define EMPTY_FUNCTION_ENTRY {NULL, NULL, NULL}
+#endif
+
 #ifdef HTTP_HAVE_CURL
 #	ifdef ZEND_ENGINE_2
 #		define HTTP_DECLARE_ARG_PASS_INFO() \