projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- ditch warnings
[m6w6/ext-http]
/
php_http_std_defs.h
diff --git
a/php_http_std_defs.h
b/php_http_std_defs.h
index 1d865642e9ca216211ea93559d14fb6c19c6f364..9ab75e9dbef017743f13eb0a451e187c219ad8af 100644
(file)
--- a/
php_http_std_defs.h
+++ b/
php_http_std_defs.h
@@
-122,6
+122,8
@@
typedef int STATUS;
#define HTTP_PHP_INI_ENTRY(entry, default, scope, updater, global) \
STD_PHP_INI_ENTRY(entry, default, scope, updater, global, zend_http_globals, http_globals)
#define HTTP_PHP_INI_ENTRY(entry, default, scope, updater, global) \
STD_PHP_INI_ENTRY(entry, default, scope, updater, global, zend_http_globals, http_globals)
+#define HTTP_PHP_INI_ENTRY_EX(entry, default, scope, updater, displayer, global) \
+ STD_PHP_INI_ENTRY_EX(entry, default, scope, updater, global, zend_http_globals, http_globals, displayer)
/* {{{ arrays */
#define FOREACH_VAL(array, val) FOREACH_HASH_VAL(Z_ARRVAL_P(array), val)
/* {{{ arrays */
#define FOREACH_VAL(array, val) FOREACH_HASH_VAL(Z_ARRVAL_P(array), val)
@@
-269,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
@@
-303,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}
+#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() \