diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-03-14 11:24:45 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-03-14 11:24:45 +0000 |
| commit | 161ae714aeec59d07551fdedffdbd2c018eedace (patch) | |
| tree | 7e8d478c5698822ce845180ef5fff3e0cfecd082 | |
| parent | a8dbb0ded603623c881bc0067fd460dc075921f2 (diff) | |
| download | php-git-161ae714aeec59d07551fdedffdbd2c018eedace.tar.gz | |
zend_hash_apply() doesn't use ZEND_HASH_APPLY_... macros
| -rw-r--r-- | Zend/zend_constants.c | 2 | ||||
| -rw-r--r-- | Zend/zend_execute_API.c | 4 | ||||
| -rw-r--r-- | Zend/zend_opcode.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index 10dbe360b3..0f8e0a41bd 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -61,7 +61,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 53d1f0d457..76533e51d5 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -103,7 +103,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); } @@ -115,7 +115,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 cd35202de8..9e68496939 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -143,7 +143,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) |