Show
Ignore:
Timestamp:
04/11/2011 06:46:16 AM (2 years ago)
Author:
moo
Message:

merge decompiler updates from trunk

Location:
branches/1.3
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/1.3

  • branches/1.3/processor/head.m4

    r726 r739  
    136136#define C_RELAYLINE , __LINE__ 
    137137') 
    138 static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type, const zstr str, long size IFASSERT(`, int relayline')) { 
     138static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type, const zstr const str, long size IFASSERT(`, int relayline')) { 
    139139    pushdef(`__LINE__', `relayline') 
    140140    int realsize = UNISW(size, (type == IS_UNICODE) ? UBYTES(size) : size); 
    … …  
    158158/* {{{ xc_store_string_n */ 
    159159REDEF(`KIND', `store') 
    160 static inline zstr xc_store_string_n(xc_processor_t *processor, zend_uchar type, const zstr str, long size IFASSERT(`, int relayline')) { 
     160static inline zstr xc_store_string_n(xc_processor_t *processor, zend_uchar type, const zstr const str, long size IFASSERT(`, int relayline')) { 
    161161    pushdef(`__LINE__', `relayline') 
    162162    int realsize = UNISW(size, (type == IS_UNICODE) ? UBYTES(size) : size);