Ignore:
Timestamp:
2006-09-24T10:02:43+02:00 (8 years ago)
Author:
moo
Message:

fix #36, wrong inheriting static class variables

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/processor.m4

    r194 r196  
    6565dnl }}} 
    6666DEF_HASH_TABLE_FUNC(`HashTable_zval_ptr',           `zval_ptr') 
     67DEF_HASH_TABLE_FUNC(`HashTable_zval_ptr_static_member_check',  `zval_ptr', , `xc_hash_static_member_check(processor, BUCKET TSRMLS_CC)') 
    6768#ifdef HAVE_XCACHE_CONSTANT 
    6869DEF_HASH_TABLE_FUNC(`HashTable_zend_constant',      `zend_constant') 
     
    297298    STRUCT(HashTable, properties_info, HashTable_zend_property_info) 
    298299#   ifdef ZEND_ENGINE_2_1 
    299     STRUCT(HashTable, default_static_members, HashTable_zval_ptr) 
     300    STRUCT(HashTable, default_static_members, IFSTORE(HashTable_zval_ptr_static_member_check, HashTable_zval_ptr)) 
    300301    IFCOPY(`dst->static_members = &dst->default_static_members;') 
     302    IFRESTORE(`if (dst->parent) xc_fix_static_members(processor, dst TSRMLS_CC);') 
    301303    DONE(static_members) 
    302304#   else 
    303     STRUCT_P(HashTable, static_members, HashTable_zval_ptr) 
     305    STRUCT_P(HashTable, static_members, IFSTORE(HashTable_zval_ptr_static_member_check, HashTable_zval_ptr)) 
    304306#   endif 
    305307    STRUCT(HashTable, constants_table, HashTable_zval_ptr) 
Note: See TracChangeset for help on using the changeset viewer.