Changeset 260 for branches/1.1

Show
Ignore:
Timestamp:
10/18/2006 04:18:12 PM (2 years ago)
Author:
moo
Message:

trunk->1.1: merged [166] use existing hashtable pDestructor to avoid accident undefined symbol

Location:
branches/1.1
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/1.1

    • Property svnmerge-integrated changed from /trunk:1-157,159,161-162,167-180,182,184,186-187,194,201,211,218,237-247,249,251-254 to /trunk:1-157,159,161-162,166-180,182,184,186-187,194,201,211,218,237-247,249,251-254

  • branches/1.1/utils.c

    r246 r260  
    384384    zend_hash_init_ex(TG(included_files), 5, NULL, NULL, 0, 1); 
    385385#ifdef HAVE_XCACHE_CONSTANT 
    386     zend_hash_init_ex(&TG(zend_constants), 20, NULL, ZEND_CONSTANT_DTOR, 1, 0); 
    387 #endif 
    388     zend_hash_init_ex(&TG(function_table), 128, NULL, ZEND_FUNCTION_DTOR, 0, 0); 
    389     zend_hash_init_ex(&TG(class_table), 16, NULL, ZEND_CLASS_DTOR, 0, 0); 
     386    zend_hash_init_ex(&TG(zend_constants), 20, NULL, EG(zend_constants)->pDestructor, 1, 0); 
     387#endif 
     388    zend_hash_init_ex(&TG(function_table), 128, NULL, CG(function_table)->pDestructor, 0, 0); 
     389    zend_hash_init_ex(&TG(class_table), 16, NULL, CG(class_table)->pDestructor, 0, 0); 
    390390 
    391391    sandbox->filename = filename;