Changeset 260 for branches/1.1

Timestamp:

2006-10-18T18:18:12+02:00 (7 years ago)

Author:

moo

Message:

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

Location:

branches/1.1

Files:

• . (modified) (1 prop)
• utils.c (modified) (1 diff)

branches/1.1/utils.c

@@ -384 +384 @@
     zend_hash_init_ex(TG(included_files), 5, NULL, NULL, 0, 1);
 #ifdef HAVE_XCACHE_CONSTANT
-    zend_hash_init_ex(&TG(zend_constants), 20, NULL, ZEND_CONSTANT_DTOR, 1, 0);
-#endif
-    zend_hash_init_ex(&TG(function_table), 128, NULL, ZEND_FUNCTION_DTOR, 0, 0);
-    zend_hash_init_ex(&TG(class_table), 16, NULL, ZEND_CLASS_DTOR, 0, 0);
+    zend_hash_init_ex(&TG(zend_constants), 20, NULL, EG(zend_constants)->pDestructor, 1, 0);
+#endif
+    zend_hash_init_ex(&TG(function_table), 128, NULL, CG(function_table)->pDestructor, 0, 0);
+    zend_hash_init_ex(&TG(class_table), 16, NULL, CG(class_table)->pDestructor, 0, 0);
 
     sandbox->filename = filename;