summaryrefslogtreecommitdiff
path: root/Zend/zend.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-07-31 13:43:17 +0200
committerAnatol Belski <ab@php.net>2015-07-31 19:09:36 +0200
commit7be9e69eafdb1828d09daecde5cd39112db3f581 (patch)
tree733014e781dcb2e96e0258bda3ee5ef847fa547c /Zend/zend.c
parent624bedcadc87038a37e1295ede781d3eaf37d24a (diff)
downloadphp-git-7be9e69eafdb1828d09daecde5cd39112db3f581.tar.gz
remove useless ifdefs
the most outer block already tell's it's ZTS code
Diffstat (limited to 'Zend/zend.c')
-rw-r--r--Zend/zend.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/Zend/zend.c b/Zend/zend.c
index b1290f76c1..4a39c7fc01 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -493,11 +493,9 @@ static void compiler_globals_ctor(zend_compiler_globals *compiler_globals) /* {{
}
compiler_globals->script_encoding_list = NULL;
-#ifdef ZTS
zend_interned_empty_string_init(&compiler_globals->empty_string);
memset(compiler_globals->one_char_string, 0, sizeof(compiler_globals->one_char_string));
-#endif
}
/* }}} */
@@ -523,9 +521,7 @@ static void compiler_globals_dtor(zend_compiler_globals *compiler_globals) /* {{
}
compiler_globals->last_static_member = 0;
-#ifdef ZTS
zend_interned_empty_string_free(&compiler_globals->empty_string);
-#endif
}
/* }}} */
@@ -564,11 +560,8 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{
static void executor_globals_dtor(zend_executor_globals *executor_globals) /* {{{ */
{
-#ifdef ZTS
zend_ini_dtor(executor_globals->ini_directives);
-#else
- zend_ini_shutdown();
-#endif
+
if (&executor_globals->persistent_list != global_persistent_list) {
zend_destroy_rsrc_list(&executor_globals->persistent_list);
}