diff options
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 8b9459ff3d..4b1b89087f 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -113,8 +113,8 @@ ZEND_INI_END() #ifdef ZTS -TSRMG_D(zend_compiler_globals, compiler_globals_id); -TSRMG_D(zend_executor_globals, executor_globals_id); +ZEND_API int compiler_globals_id; +ZEND_API int executor_globals_id; static HashTable *global_function_table = NULL; static HashTable *global_class_table = NULL; static HashTable *global_constants_table = NULL; @@ -578,8 +578,8 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions TS #ifdef ZTS zend_compiler_globals *compiler_globals; zend_executor_globals *executor_globals; - TSRMG_DH(zend_ini_scanner_globals, ini_scanner_globals_id); - TSRMG_DH(zend_php_scanner_globals, language_scanner_globals_id); + extern ZEND_API ts_rsrc_id ini_scanner_globals_id; + extern ZEND_API ts_rsrc_id language_scanner_globals_id; #else extern zend_ini_scanner_globals ini_scanner_globals; extern zend_php_scanner_globals language_scanner_globals; @@ -652,10 +652,10 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions TS zend_init_rsrc_list_dtors(); #ifdef ZTS - TSRMG_ALLOCATE(compiler_globals_id, sizeof(zend_compiler_globals), (ts_allocate_ctor) compiler_globals_ctor, (ts_allocate_dtor) compiler_globals_dtor); - TSRMG_ALLOCATE(executor_globals_id, sizeof(zend_executor_globals), (ts_allocate_ctor) executor_globals_ctor, (ts_allocate_dtor) executor_globals_dtor); - TSRMG_ALLOCATE(language_scanner_globals_id, sizeof(zend_php_scanner_globals), (ts_allocate_ctor) php_scanner_globals_ctor, NULL); - TSRMG_ALLOCATE(ini_scanner_globals_id, sizeof(zend_ini_scanner_globals), (ts_allocate_ctor) ini_scanner_globals_ctor, NULL); + ts_allocate_id(&compiler_globals_id, sizeof(zend_compiler_globals), (ts_allocate_ctor) compiler_globals_ctor, (ts_allocate_dtor) compiler_globals_dtor); + ts_allocate_id(&executor_globals_id, sizeof(zend_executor_globals), (ts_allocate_ctor) executor_globals_ctor, (ts_allocate_dtor) executor_globals_dtor); + ts_allocate_id(&language_scanner_globals_id, sizeof(zend_php_scanner_globals), (ts_allocate_ctor) php_scanner_globals_ctor, NULL); + ts_allocate_id(&ini_scanner_globals_id, sizeof(zend_ini_scanner_globals), (ts_allocate_ctor) ini_scanner_globals_ctor, NULL); compiler_globals = ts_resource(compiler_globals_id); executor_globals = ts_resource(executor_globals_id); |