diff options
| author | Xinchen Hui <laruence@php.net> | 2014-05-25 18:32:35 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-05-25 18:32:35 +0800 |
| commit | c2082ece52bcb5343ae0feb460807596cd79d691 (patch) | |
| tree | 3f85e08b0389513932a60f8164dfe27a30884876 /Zend/zend_API.c | |
| parent | 5d7f82745f46025af4fd89f7e3f3883e92d55509 (diff) | |
| download | php-git-c2082ece52bcb5343ae0feb460807596cd79d691.tar.gz | |
Fixed apply_func_t (they should be broken before)
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 22ba10b029..a52abe3544 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2583,8 +2583,16 @@ int module_registry_unload_temp(const zend_module_entry *module TSRMLS_DC) /* {{ } /* }}} */ -static int exec_done_cb(zend_module_entry *module TSRMLS_DC) /* {{{ */ +static int module_registry_unload_temp_wrapper(zval *el TSRMLS_DC) /* {{{ */ { + zend_module_entry *module = (zend_module_entry *)Z_PTR_P(el); + return module_registry_unload_temp((const zend_module_entry *)module TSRMLS_CC); +} +/* }}} */ + +static int exec_done_cb(zval *el TSRMLS_DC) /* {{{ */ +{ + zend_module_entry *module = (zend_module_entry *)Z_PTR_P(el); if (module->post_deactivate_func) { module->post_deactivate_func(); } @@ -2595,8 +2603,8 @@ static int exec_done_cb(zend_module_entry *module TSRMLS_DC) /* {{{ */ ZEND_API void zend_post_deactivate_modules(TSRMLS_D) /* {{{ */ { if (EG(full_tables_cleanup)) { - zend_hash_apply(&module_registry, (apply_func_t) exec_done_cb TSRMLS_CC); - zend_hash_reverse_apply(&module_registry, (apply_func_t) module_registry_unload_temp TSRMLS_CC); + zend_hash_apply(&module_registry, exec_done_cb TSRMLS_CC); + zend_hash_reverse_apply(&module_registry, module_registry_unload_temp_wrapper TSRMLS_CC); } else { zend_module_entry **p = module_post_deactivate_handlers; |