- 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 51b61254533acd62b49e0b0a64d29e149b41a186..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"
 
@@ -149,7 +143,7 @@ typedef int STATUS;
 #define FOREACH_VAL(pos, array, val) FOREACH_HASH_VAL(pos, Z_ARRVAL_P(array), val)
 #define FOREACH_HASH_VAL(pos, hash, val) \
        for (   zend_hash_internal_pointer_reset_ex(hash, &pos); \
-                       zend_hash_get_current_data_ex(hash, (void **) &val, &pos) == SUCCESS; \
+                       zend_hash_get_current_data_ex(hash, (void *) &val, &pos) == SUCCESS; \
                        zend_hash_move_forward_ex(hash, &pos))
 
 #define FOREACH_KEY(pos, array, strkey, numkey) FOREACH_HASH_KEY(pos, Z_ARRVAL_P(array), strkey, numkey)
@@ -168,14 +162,14 @@ typedef int STATUS;
 #define FOREACH_HASH_KEYVAL(pos, hash, strkey, numkey, val) \
        for (   zend_hash_internal_pointer_reset_ex(hash, &pos); \
                        zend_hash_get_current_key_ex(hash, &strkey, NULL, &numkey, 0, &pos) != HASH_KEY_NON_EXISTANT && \
-                       zend_hash_get_current_data_ex(hash, (void **) &val, &pos) == SUCCESS; \
+                       zend_hash_get_current_data_ex(hash, (void *) &val, &pos) == SUCCESS; \
                        zend_hash_move_forward_ex(hash, &pos))
 
 #define FOREACH_KEYLENVAL(pos, array, strkey, keylen, numkey, val) FOREACH_HASH_KEYLENVAL(pos, Z_ARRVAL_P(array), strkey, keylen, numkey, val)
 #define FOREACH_HASH_KEYLENVAL(pos, hash, strkey, keylen, numkey, val) \
        for (   zend_hash_internal_pointer_reset_ex(hash, &pos); \
                        zend_hash_get_current_key_ex(hash, &strkey, &keylen, &numkey, 0, &pos) != HASH_KEY_NON_EXISTANT && \
-                       zend_hash_get_current_data_ex(hash, (void **) &val, &pos) == SUCCESS; \
+                       zend_hash_get_current_data_ex(hash, (void *) &val, &pos) == SUCCESS; \
                        zend_hash_move_forward_ex(hash, &pos))
 
 #define array_copy(src, dst)   zend_hash_copy(Z_ARRVAL_P(dst), Z_ARRVAL_P(src), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *))
@@ -190,13 +184,13 @@ typedef int STATUS;
                 \
                for (   zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(src), &pos); \
                                zend_hash_get_current_key_ex(Z_ARRVAL_P(src), &key, &klen, &idx, 0, &pos) != HASH_KEY_NON_EXISTANT && \
-                               zend_hash_get_current_data_ex(Z_ARRVAL_P(src), (void **) &data, &pos) == SUCCESS; \
+                               zend_hash_get_current_data_ex(Z_ARRVAL_P(src), (void *) &data, &pos) == SUCCESS; \
                                zend_hash_move_forward_ex(Z_ARRVAL_P(src), &pos)) \
                { \
                        if (key) { \
                                zval **tmp; \
                                 \
-                               if (SUCCESS == zend_hash_find(Z_ARRVAL_P(dst), key, klen, (void **) &tmp)) { \
+                               if (SUCCESS == zend_hash_find(Z_ARRVAL_P(dst), key, klen, (void *) &tmp)) { \
                                        if (Z_TYPE_PP(tmp) != IS_ARRAY) { \
                                                convert_to_array_ex(tmp); \
                                        } \
@@ -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