zend_hash_apply() doesn't use ZEND_HASH_APPLY_... macros

diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
index 95948b26231db0ec2865640ce6cee9c40fbf9c0e..69607d1620f3909f7ad03956fc718e63df571850 100644 (file)
--- a/Zend/zend_constants.c
+++ b/Zend/zend_constants.c
@@ -66,7 +66,7 @@ static int clean_non_persistent_constant(zend_constant *c TSRMLS_DC)
 
 static int clean_non_persistent_constant_full(zend_constant *c TSRMLS_DC)
 {
-       return (c->flags & CONST_PERSISTENT) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE;
+       return (c->flags & CONST_PERSISTENT) ? 0 : 1;
 }
 
 

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index cc8308b844e039c2396612b9221db439500d7b9a..bd5643fe5b92109587e7e6e4e8b4ab08c8591e6c 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -115,7 +115,7 @@ static int clean_non_persistent_function(zend_function *function TSRMLS_DC)
 
 static int clean_non_persistent_function_full(zend_function *function TSRMLS_DC)
 {
-       return (function->type == ZEND_INTERNAL_FUNCTION) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE;
+       return (function->type != ZEND_INTERNAL_FUNCTION);
 }
 
 
@@ -127,7 +127,7 @@ static int clean_non_persistent_class(zend_class_entry **ce TSRMLS_DC)
 
 static int clean_non_persistent_class_full(zend_class_entry **ce TSRMLS_DC)
 {
-       return ((*ce)->type == ZEND_INTERNAL_CLASS) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE;
+       return ((*ce)->type != ZEND_INTERNAL_CLASS);
 }
 
 

diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index d3b502d5cf8a7e134deb0944f2bb63ea7b1394ef..cdaf0c3dc7d7558258d1ce4b9bf3b9e1902fc535 100644 (file)
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -146,7 +146,7 @@ ZEND_API int zend_cleanup_function_data_full(zend_function *function TSRMLS_DC)
        if (function->type == ZEND_USER_FUNCTION) {
                zend_cleanup_op_array_data((zend_op_array *) function);
        }
-       return ZEND_HASH_APPLY_KEEP;
+       return 0;
 }
 
 ZEND_API int zend_cleanup_class_data(zend_class_entry **pce TSRMLS_DC)