MFB: - Rationalize code a bit

diff --git a/Zend/zend.c b/Zend/zend.c
index 7737280c0a1eba8a3f7a6ebefbc6207ed8e03755..2b28a21eb508773a7a55f31d435c9bf1e4a2d510 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -495,23 +495,18 @@ static void zend_new_thread_end_handler(THREAD_T thread_id TSRMLS_DC)
        zend_ini_refresh_caches(ZEND_INI_STAGE_STARTUP TSRMLS_CC);
 }
 
+static void alloc_globals_dtor(zend_alloc_globals *alloc_globals_p TSRMLS_DC)
+{
+       shutdown_memory_manager(0, 1 TSRMLS_CC);
+}
 #endif
 
-
 static void alloc_globals_ctor(zend_alloc_globals *alloc_globals_p TSRMLS_DC)
 {
        start_memory_manager(TSRMLS_C);
 }
 
 
-#ifdef ZTS
-static void alloc_globals_dtor(zend_alloc_globals *alloc_globals_p TSRMLS_DC)
-{
-       shutdown_memory_manager(0, 1 TSRMLS_CC);
-}
-#endif
-
-
 #if defined(__FreeBSD__) || defined(__DragonFly__)
 /* FreeBSD and DragonFly floating point precision fix */
 #include <floatingpoint.h>
@@ -707,6 +702,7 @@ void zend_shutdown(TSRMLS_D)
 
        zend_hash_destroy(GLOBAL_AUTO_GLOBALS_TABLE);
        free(GLOBAL_AUTO_GLOBALS_TABLE);
+
        zend_shutdown_extensions(TSRMLS_C);
        free(zend_version_info);