Changeset 196 for trunk/processor/processor.m4

Timestamp:

2006-09-24T10:02:43+02:00 (7 years ago)

Author:

moo

Message:

fix #36, wrong inheriting static class variables

File:

• trunk/processor/processor.m4 (modified) (2 diffs)

trunk/processor/processor.m4

@@ -65 +65 @@
 dnl }}}
 DEF_HASH_TABLE_FUNC(`HashTable_zval_ptr',           `zval_ptr')
+DEF_HASH_TABLE_FUNC(`HashTable_zval_ptr_static_member_check',  `zval_ptr', , `xc_hash_static_member_check(processor, BUCKET TSRMLS_CC)')
 #ifdef HAVE_XCACHE_CONSTANT
 DEF_HASH_TABLE_FUNC(`HashTable_zend_constant',      `zend_constant')
@@ -297 +298 @@
     STRUCT(HashTable, properties_info, HashTable_zend_property_info)
 #   ifdef ZEND_ENGINE_2_1
-    STRUCT(HashTable, default_static_members, HashTable_zval_ptr)
+    STRUCT(HashTable, default_static_members, IFSTORE(HashTable_zval_ptr_static_member_check, HashTable_zval_ptr))
     IFCOPY(`dst->static_members = &dst->default_static_members;')
+    IFRESTORE(`if (dst->parent) xc_fix_static_members(processor, dst TSRMLS_CC);')
     DONE(static_members)
 #   else
-    STRUCT_P(HashTable, static_members, HashTable_zval_ptr)
+    STRUCT_P(HashTable, static_members, IFSTORE(HashTable_zval_ptr_static_member_check, HashTable_zval_ptr))
 #   endif
     STRUCT(HashTable, constants_table, HashTable_zval_ptr)