Fix for Thies's UMR

diff --git a/Zend/zend.c b/Zend/zend.c
index 568e8ff78b4514e93da26ece369476bb89b89a25..39d945e963fb327018efc785ca5f68fd41ac6abf 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -262,7 +262,7 @@ static void compiler_globals_dtor(zend_compiler_globals *compiler_globals)
 static void executor_globals_ctor(zend_executor_globals *executor_globals)
 {
        if (global_constants_table) {
-               zend_startup_constants(executor_globals->zend_constants ELS_CC);
+               zend_startup_constants(ELS_C);
                zend_copy_constants(executor_globals->zend_constants, global_constants_table);
        }
        init_resource_plist(ELS_C);
@@ -334,10 +334,10 @@ 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(EG(zend_constants), executor_globals);
+       zend_startup_constants(executor_globals);
        GLOBAL_CONSTANTS_TABLE = EG(zend_constants);
 #else
-       zend_startup_constants(EG(zend_constants));
+       zend_startup_constants();
 #endif
        zend_register_standard_constants(ELS_C);
 

diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
index 2ba1fcf6de25d838fefeafc165f40c9058fce5a2..345c246ae573139ab7b5b78712322928459554dc 100644 (file)
--- a/Zend/zend_constants.c
+++ b/Zend/zend_constants.c
@@ -78,7 +78,7 @@ void clean_module_constants(int module_number)
 }
 
 
-int zend_startup_constants(HashTable *constants ELS_DC)
+int zend_startup_constants(ELS_D)
 {
 #if WIN32|WINNT
        DWORD dwBuild=0;

diff --git a/Zend/zend_constants.h b/Zend/zend_constants.h
index 39599dba7bf03e6124da761f0a850ac401d4836b..fd196c450d8d7852b85d24d6f371fd2b0b420505 100644 (file)
--- a/Zend/zend_constants.h
+++ b/Zend/zend_constants.h
@@ -46,7 +46,7 @@ typedef struct _zend_constant {
 
 void clean_module_constants(int module_number);
 int free_zend_constant(zend_constant *c);
-int zend_startup_constants(HashTable *constants ELS_DC);
+int zend_startup_constants(ELS_D);
 int zend_shutdown_constants(ELS_D);
 void zend_register_standard_constants(ELS_D);
 void clean_non_persistent_constants(void);