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_ini.c | |
| parent | 5d7f82745f46025af4fd89f7e3f3883e92d55509 (diff) | |
| download | php-git-c2082ece52bcb5343ae0feb460807596cd79d691.tar.gz | |
Fixed apply_func_t (they should be broken before)
Diffstat (limited to 'Zend/zend_ini.c')
| -rw-r--r-- | Zend/zend_ini.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c index 883a6bf84b..ca4e4d7863 100644 --- a/Zend/zend_ini.c +++ b/Zend/zend_ini.c @@ -76,9 +76,10 @@ static int zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stage TSRMLS } /* }}} */ -static int zend_restore_ini_entry_wrapper(zend_ini_entry **ini_entry TSRMLS_DC) /* {{{ */ +static int zend_restore_ini_entry_wrapper(zval *el TSRMLS_DC) /* {{{ */ { - zend_restore_ini_entry_cb(*ini_entry, ZEND_INI_STAGE_DEACTIVATE TSRMLS_CC); + zend_ini_entry *ini_entry = (zend_ini_entry *)Z_PTR_P(el); + zend_restore_ini_entry_cb(ini_entry, ZEND_INI_STAGE_DEACTIVATE TSRMLS_CC); return 1; } /* }}} */ @@ -123,7 +124,7 @@ ZEND_API int zend_ini_global_shutdown(TSRMLS_D) /* {{{ */ ZEND_API int zend_ini_deactivate(TSRMLS_D) /* {{{ */ { if (EG(modified_ini_directives)) { - zend_hash_apply(EG(modified_ini_directives), (apply_func_t) zend_restore_ini_entry_wrapper TSRMLS_CC); + zend_hash_apply(EG(modified_ini_directives), zend_restore_ini_entry_wrapper TSRMLS_CC); zend_hash_destroy(EG(modified_ini_directives)); FREE_HASHTABLE(EG(modified_ini_directives)); EG(modified_ini_directives) = NULL; |