diff options
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 1f948c92f4..19b571acb6 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -321,10 +321,12 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions) compiler_globals_dtor(compiler_globals); compiler_globals->function_table = GLOBAL_FUNCTION_TABLE; compiler_globals->class_table = GLOBAL_CLASS_TABLE; - zend_startup_constants(executor_globals->zend_constants, executor_globals); - GLOBAL_CONSTANTS_TABLE = executor_globals->zend_constants; - zend_register_standard_constants(ELS_C); + zend_startup_constants(EG(zend_constants), executor_globals); + GLOBAL_CONSTANTS_TABLE = EG(zend_constants); +#else + zend_startup_constants(EG(zend_constants)); #endif + zend_register_standard_constants(ELS_C); #ifndef ZTS init_resource_plist(ELS_C); |