Fixed ZTS build

diff --git a/Zend/zend.c b/Zend/zend.c
index 0fbe847d8061b6e65822bd0c086fac2bf6756d94..64a75511f4c23444e7a0f974eff0412f9630a97a 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -505,9 +505,9 @@ static void compiler_globals_ctor(zend_compiler_globals *compiler_globals TSRMLS
 
        compiler_globals->last_static_member = zend_hash_num_elements(compiler_globals->class_table);
        if (compiler_globals->last_static_member) {
-               compiler_globals->static_members = (HashTable**)calloc(compiler_globals->last_static_member, sizeof(HashTable*));
+               compiler_globals->static_members_table = calloc(compiler_globals->last_static_member, sizeof(zval**));
        } else {
-               compiler_globals->static_members = NULL;
+               compiler_globals->static_members_table = NULL;
        }
 }
 /* }}} */
@@ -526,8 +526,8 @@ static void compiler_globals_dtor(zend_compiler_globals *compiler_globals TSRMLS
                zend_hash_destroy(compiler_globals->auto_globals);
                free(compiler_globals->auto_globals);
        }
-       if (compiler_globals->static_members) {
-               free(compiler_globals->static_members);
+       if (compiler_globals->static_members_table) {
+               free(compiler_globals->static_members_table);
        }
        compiler_globals->last_static_member = 0;
 }

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 567f45c03d14bf57d10e83b2925133ee0991911f..1fc31b02cf4278337b2c5008418ab5858c9f3698 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1026,7 +1026,7 @@ ZEND_API void zend_update_class_constants(zend_class_entry *class_type TSRMLS_DC
                                zend_update_class_constants(class_type->parent TSRMLS_CC);
                        }
 #if ZTS
-                       CG(static_members)[(zend_intptr_t)(class_type->static_members)] = emalloc(sizeof(zval*) * class_type->default_static_members_count);
+                       CG(static_members_table)[(zend_intptr_t)(class_type->static_members_table)] = emalloc(sizeof(zval*) * class_type->default_static_members_count);
 #else
                        class_type->static_members_table = emalloc(sizeof(zval*) * class_type->default_static_members_count);
 #endif

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index e07b52f503e3a5e67fa83097292bf454bedc239b..9c7fbb3301d93a9f347dceb0f512dff7dd34f40b 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -208,7 +208,7 @@ typedef struct _zend_fcall_info_cache {
        INIT_OVERLOADED_CLASS_ENTRY(class_container, ZEND_NS_NAME(ns, class_name), functions, handle_fcall, handle_propget, handle_propset)
 
 #ifdef ZTS
-#      define CE_STATIC_MEMBERS(ce) (((ce)->type==ZEND_USER_CLASS)?(ce)->static_members:CG(static_members_table)[(zend_intptr_t)(ce)->static_members_table])
+#      define CE_STATIC_MEMBERS(ce) (((ce)->type==ZEND_USER_CLASS)?(ce)->static_members_table:CG(static_members_table)[(zend_intptr_t)(ce)->static_members_table])
 #else
 #      define CE_STATIC_MEMBERS(ce) ((ce)->static_members_table)
 #endif

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 4af725eccaf6647dc25a263ddc259c2063e24c14..51fb9cddd6385f2ffda97773b5a9c1c553442e74 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -6140,18 +6140,18 @@ ZEND_API void zend_initialize_class_data(zend_class_entry *ce, zend_bool nullify
 #ifdef ZTS
                int n = zend_hash_num_elements(CG(class_table));
 
-               if (CG(static_members) && n >= CG(last_static_member)) {
+               if (CG(static_members_table) && n >= CG(last_static_member)) {
                        /* Support for run-time declaration: dl() */
                        CG(last_static_member) = n+1;
-                       CG(static_members) = realloc(CG(static_members), (n+1)*sizeof(HashTable*));
-                       CG(static_members)[n] = NULL;
+                       CG(static_members_table) = realloc(CG(static_members_table), (n+1)*sizeof(zval**));
+                       CG(static_members_table)[n] = NULL;
                }
                ce->static_members_table = (zval**)(zend_intptr_t)n;
 #else
                ce->static_members_table = NULL;
 #endif
        } else {
-               ce->static_members_table = &ce->default_static_members_table;
+               ce->static_members_table = ce->default_static_members_table;
        }
 
        ce->default_properties_count = 0;

diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index 010a0db8e51179837bb75c4838c80ea5371c0a6f..01f24712c1ec37e7dc29b405aace80bf0383126a 100644 (file)
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -166,7 +166,7 @@ struct _zend_compiler_globals {
 #endif /* ZEND_MULTIBYTE */
 
 #ifdef ZTS
-       HashTable **static_members;
+       zval ***static_members_table;
        int last_static_member;
 #endif
 };

diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index 880be865a548b0efffce293fb57663e1d8320239..be30da3fc7ca359bd778939fe7bc88a53c0da51d 100644 (file)
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -175,7 +175,7 @@ ZEND_API int zend_cleanup_class_data(zend_class_entry **pce TSRMLS_DC)
                }
                efree(CE_STATIC_MEMBERS(*pce));
 #ifdef ZTS
-               CG(static_members)[(zend_intptr_t)((*pce)->static_members)] = NULL;
+               CG(static_members_table)[(zend_intptr_t)((*pce)->static_members_table)] = NULL;
 #else
                (*pce)->static_members_table = NULL;
 #endif

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index c1919afb5ffa0346f613d989dbd08de867e55377..12594c91a844c850a11437d5bb10a89c40364c85 100644 (file)
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -1564,7 +1564,7 @@ ZEND_METHOD(reflection_function, __construct)
 
        MAKE_STD_ZVAL(name);
        ZVAL_STRING(name, fptr->common.function_name, 1);
-       reflection_update_property(object, "name", name TSRMLS_CC);
+       reflection_update_property(object, "name", name);
        intern->ptr = fptr;
        intern->ref_type = REF_TYPE_FUNCTION;
        intern->obj = closure;