diff options
| author | Sebastian Bergmann <sebastian@php.net> | 2003-02-16 11:34:49 +0000 |
|---|---|---|
| committer | Sebastian Bergmann <sebastian@php.net> | 2003-02-16 11:34:49 +0000 |
| commit | 6d300baf8473cc257da6580f13269c1d48668826 (patch) | |
| tree | c00d045e79ce9d5d8318378b5de76446fa8da239 /Zend/zend.c | |
| parent | e77eca7568715ed74f9490cfec1dfcad0960fe08 (diff) | |
| download | php-git-6d300baf8473cc257da6580f13269c1d48668826.tar.gz | |
ZTS fixes
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index e3b538a3e2..aba1f37e64 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -370,7 +370,7 @@ static FILE *zend_fopen_wrapper(const char *filename, char **opened_path) } -static void register_standard_class(void) +static void register_standard_class(TSRMLS_D) { zend_standard_class_def = malloc(sizeof(zend_class_entry)); @@ -378,7 +378,7 @@ static void register_standard_class(void) zend_standard_class_def->name = zend_strndup("stdClass", zend_standard_class_def->name_length); zend_standard_class_def->name_length = sizeof("stdClass") - 1; zend_standard_class_def->parent = NULL; - zend_initialize_class_data(zend_standard_class_def, 1); + zend_initialize_class_data(zend_standard_class_def, 1 TSRMLS_CC); zend_hash_add(GLOBAL_CLASS_TABLE, "stdclass", sizeof("stdclass"), &zend_standard_class_def, sizeof(zend_class_entry *), NULL); } @@ -560,7 +560,6 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i zend_hash_init_ex(GLOBAL_FUNCTION_TABLE, 100, NULL, ZEND_FUNCTION_DTOR, 1, 0); zend_hash_init_ex(GLOBAL_CLASS_TABLE, 10, NULL, ZEND_CLASS_DTOR, 1, 0); - register_standard_class(); zend_hash_init_ex(&module_registry, 50, NULL, ZEND_MODULE_DTOR, 1, 0); zend_init_rsrc_list_dtors(); @@ -597,6 +596,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i EG(user_error_handler) = NULL; EG(user_exception_handler) = NULL; #endif + register_standard_class(TSRMLS_C); zend_register_standard_constants(TSRMLS_C); #ifndef ZTS |