Changeset 652 in svn for branches/1.3


Ignore:
Timestamp:
2009-07-20T05:31:07Z (6 years ago)
Author:
Xuefer
Message:

merged r651 from trunk, fix Constant X already defined issue

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 651
  • branches/1.3/utils.c

    r641 r652  
    653653        zend_hash_copy(&TG(zend_constants), &XG(internal_constant_table), (copy_ctor_func_t) xc_zend_constant_ctor, (void *) &tmp_const, sizeof(tmp_const));
    654654    }
     655    TG(internal_constant_tail) = TG(zend_constants).pListTail;
    655656#endif
    656657    h = OG(function_table);
     
    715716
    716717#ifdef HAVE_XCACHE_CONSTANT
    717     b = /*TG(internal_constant_tail) ? TG(internal_constant_tail)->pListNext :*/ TG(zend_constants).pListHead;
     718    b = TG(internal_constant_tail) ? TG(internal_constant_tail)->pListNext : TG(zend_constants).pListHead;
    718719    /* install constants */
    719720    while (b != NULL) {
Note: See TracChangeset for help on using the changeset viewer.