summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Bergmann <sebastian@php.net>2003-04-19 09:04:15 +0000
committerSebastian Bergmann <sebastian@php.net>2003-04-19 09:04:15 +0000
commita17d2f37ea2a4e2a2703ca729a089d167e64df64 (patch)
treeb086abe79cec7dcf6dbde1bae4065345ae1f9173
parent6be2406b63990967f1e316f32575e5b48bb2547f (diff)
downloadphp-git-a17d2f37ea2a4e2a2703ca729a089d167e64df64.tar.gz
Corrected patch by Marcus Börger <helly@php.net>.
-rw-r--r--Zend/zend.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/Zend/zend.c b/Zend/zend.c
index 488aa3fa7a..995c6f6d75 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -382,10 +382,12 @@ static void register_standard_class(TSRMLS_D)
zend_hash_add(GLOBAL_CLASS_TABLE, "stdclass", sizeof("stdclass"), &zend_standard_class_def, sizeof(zend_class_entry *), NULL);
}
+#ifdef ZTS
static void unregister_standard_class()
{
destroy_zend_class(&zend_standard_class_def);
}
+#endif
static void zend_set_default_compile_time_values(TSRMLS_D)
{
@@ -474,10 +476,12 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals_p TSRMLS_DC)
}
+#ifdef ZTS
static void alloc_globals_dtor(zend_alloc_globals *alloc_globals_p TSRMLS_DC)
{
shutdown_memory_manager(0, 1 TSRMLS_CC);
}
+#endif
#ifdef __FreeBSD__
@@ -672,8 +676,8 @@ void zend_shutdown(TSRMLS_D)
zend_shutdown_constants(TSRMLS_C);
#ifdef ZTS
zend_hash_destroy(GLOBAL_CONSTANTS_TABLE);
-#endif
unregister_standard_class();
+#endif
}