diff options
| author | Nikita Popov <nikic@php.net> | 2014-04-09 15:51:28 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-04-09 23:41:16 +0200 |
| commit | 20f2e5986e7d9e5978eaed8d6d60cd6bf917ea37 (patch) | |
| tree | 0c3237e875f1e40fc4aa5daf1a971a1f7187c84d /Zend/zend_ini.c | |
| parent | 2016e72111f371e8e4d96f6d7cb870ca0e673175 (diff) | |
| download | php-git-20f2e5986e7d9e5978eaed8d6d60cd6bf917ea37.tar.gz | |
Fix ZTS build
This only makes it compile, it doesn't actually work, presumably
because interned strings are assumed in some places.
Diffstat (limited to 'Zend/zend_ini.c')
| -rw-r--r-- | Zend/zend_ini.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c index 882049830b..4ac379ca91 100644 --- a/Zend/zend_ini.c +++ b/Zend/zend_ini.c @@ -137,15 +137,13 @@ ZEND_API int zend_ini_deactivate(TSRMLS_D) /* {{{ */ #ifdef ZTS ZEND_API int zend_copy_ini_directives(TSRMLS_D) /* {{{ */ { - zend_ini_entry ini_entry; - EG(modified_ini_directives) = NULL; EG(error_reporting_ini_entry) = NULL; EG(ini_directives) = (HashTable *) malloc(sizeof(HashTable)); if (zend_hash_init_ex(EG(ini_directives), registered_zend_ini_directives->nNumOfElements, NULL, NULL, 1, 0) == FAILURE) { return FAILURE; } - zend_hash_copy(EG(ini_directives), registered_zend_ini_directives, NULL, &ini_entry, sizeof(zend_ini_entry)); + zend_hash_copy(EG(ini_directives), registered_zend_ini_directives, NULL); return SUCCESS; } /* }}} */ |