Changeset 823 in svn for trunk/processor/hashtable.m4


Ignore:
Timestamp:
2012-03-22T18:29:49+01:00 (3 years ago)
Author:
Xuefer
Message:

PHP_5_4: HashTable? bucket changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/hashtable.m4

    r822 r823  
    104104            IFCALCCOPY(`bucketsize = BUCKET_SIZE(b);')
    105105            ALLOC(pnew, char, bucketsize, , Bucket)
    106             IFCOPY(`memcpy(pnew, b, bucketsize);')
     106            IFCOPY(`
     107#ifdef ZEND_ENGINE_2_4
     108            memcpy(pnew, b, BUCKET_HEAD_SIZE(Bucket));
     109            pnew->arKey = (const char *) (pnew + 1);
     110            memcpy(pnew->arKey, b->arKey, BUCKET_KEY_SIZE(b));
     111#else
     112            memcpy(pnew, b, bucketsize);
     113    #endif
     114            ')
    107115            IFCOPY(`
    108116                n = b->h & src->nTableMask;
Note: See TracChangeset for help on using the changeset viewer.