Changeset 652 for branches/1.3/utils.c

Timestamp:

2009-07-20T07:31:07+02:00 (4 years ago)

Author:

moo

Message:

merged r651 from trunk, fix Constant X already defined issue

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• utils.c (modified) (2 diffs)

branches/1.3/utils.c

@@ -653 +653 @@
         zend_hash_copy(&TG(zend_constants), &XG(internal_constant_table), (copy_ctor_func_t) xc_zend_constant_ctor, (void *) &tmp_const, sizeof(tmp_const));
     }
+    TG(internal_constant_tail) = TG(zend_constants).pListTail;
 #endif
     h = OG(function_table);
@@ -715 +716 @@
 
 #ifdef HAVE_XCACHE_CONSTANT
-    b = /*TG(internal_constant_tail) ? TG(internal_constant_tail)->pListNext :*/ TG(zend_constants).pListHead;
+    b = TG(internal_constant_tail) ? TG(internal_constant_tail)->pListNext : TG(zend_constants).pListHead;
     /* install constants */
     while (b != NULL) {