From: Anatol Belski <ab@php.net>
Date: Fri, 31 Jul 2015 11:43:17 +0000 (+0200)
Subject: remove useless ifdefs
X-Git-Tag: php-7.0.0beta3~5^2~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7be9e69eafdb1828d09daecde5cd39112db3f581;p=php

remove useless ifdefs

the most outer block already tell's it's ZTS code
---

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);
 	}