Changeset 08f6177 in git


Ignore:
Timestamp:
2009-07-05T06:27:24Z (10 years ago)
Author:
Xuefer <xuefer@…>
Branches:
1.3
Children:
5d85c25
Parents:
9b14b99
Message:

merged r484 from trunk: fix: zval_data type size mismatch

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

Location:
processor
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • processor/dispatch.m4

    r4389208 r08f6177  
    22define(`DISPATCH', `
    33    DBG(`$0($*)')
     4    assert(sizeof($1) == sizeof(src->$2));
    45    ifelse(
    56        `$1', `zend_bool',        `PROC_INT(`$2', `u',  `$1')'
  • processor/processor.m4

    r633eec1 r08f6177  
    150150        DISPATCH(zval_data_type, type)
    151151        DISPATCH(zend_uchar, is_ref)
     152#ifdef ZEND_ENGINE_2
     153        DISPATCH(zend_uint, refcount)
     154#else
    152155        DISPATCH(zend_ushort, refcount)
     156#endif
    153157#ifdef ZEND_ENGINE_2_3
    154158        DISPATCH(zend_uchar, idx_type)
Note: See TracChangeset for help on using the changeset viewer.