projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- add rebuild script
[m6w6/ext-http]
/
php_http_std_defs.h
diff --git
a/php_http_std_defs.h
b/php_http_std_defs.h
index cfb9cee5504f16e79d8a25b3ce2b1a50a0834991..f166fe5ade8d77c77c7b89649b09fec91f14a27a 100644
(file)
--- 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
#ifndef E_THROW
# define E_THROW 0
#endif
-#define HE_THROW E_THROW
#ifdef ZEND_ENGINE_2
#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
#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
#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
# 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, 0}
+#else
+# define EMPTY_FUNCTION_ENTRY {NULL, NULL, NULL}
+#endif
+
#ifdef HTTP_HAVE_CURL
# ifdef ZEND_ENGINE_2
# define HTTP_DECLARE_ARG_PASS_INFO() \
#ifdef HTTP_HAVE_CURL
# ifdef ZEND_ENGINE_2
# define HTTP_DECLARE_ARG_PASS_INFO() \