Changeset 616 for branches/1.3


Ignore:
Timestamp:
2009-07-05T08:27:24+02:00 (5 years ago)
Author:
moo
Message:

merged r484 from trunk: fix: zval_data type size mismatch

Location:
branches/1.3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 484
  • branches/1.3/processor/dispatch.m4

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

    r594 r616  
    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.