- adjust ini entry names to those of the globals struct

[m6w6/ext-http] / php_http_std_defs.h

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index a3a3056f168e49ca52608f4162d3305fce859ac8..b4218bd556c1d87eea2861ec7ab50b487214b5f5 100644 (file)
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -96,12 +96,6 @@ typedef int STATUS;
                zend_error(E_NOTICE, "Wrong parameter count for %s()", get_active_function_name(TSRMLS_C)); \
        }
 
-/* check if return value is used */
-#define IF_RETVAL_USED \
-       if (!return_value_used) { \
-               return; \
-       } else
-
 /* CR LF */
 #define HTTP_CRLF "\r\n"
 
@@ -292,6 +286,26 @@ typedef int STATUS;
 #endif /* ZEND_ENGINE_2 */
 /* }}} */
 
+#ifdef ZEND_ENGINE_2
+#      define with_error_handling(eh, ec) \
+       { \
+               error_handling_t __eh = PG(error_handling); \
+               zend_class_entry *__ec= PG(exception_class); \
+               php_set_error_handling(eh, ec TSRMLS_CC);
+#      define end_error_handling() \
+               php_set_error_handling(__eh, __ec TSRMLS_CC); \
+       }
+#else
+#      define with_error_handling(eh, ec)
+#      define end_error_handling()
+#endif
+
+#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 2) || PHP_MAJOR_VERSION > 5
+#      define  ZEND_EXCEPTION_GET_DEFAULT() zend_exception_get_default(TSRMLS_C)
+#else
+#      define  ZEND_EXCEPTION_GET_DEFAULT() zend_exception_get_default()
+#endif
+
 #ifndef E_THROW
 #      define E_THROW 0
 #endif