Changeset 86d0b27 in git


Ignore:
Timestamp:
2009-07-20T05:31:07Z (11 years ago)
Author:
Xuefer <xuefer@…>
Branches:
1.3
Children:
09249fe, d0497fb
Parents:
2b31f23
Message:

merged r651 from trunk, fix Constant X already defined issue

git-svn-id: svn://svn.lighttpd.net/xcache/branches/1.3@652 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

File:
1 edited

Legend:

Unmodified
Added
Removed
  • utils.c

    rff78ab8 r86d0b27  
    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.