Show
Ignore:
Timestamp:
07/08/2009 06:40:03 AM (4 years ago)
Author:
moo
Message:

merged r645 from trunk

Location:
branches/1.3
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 645

  • branches/1.3/processor/head.m4

    r622 r646  
    130130/* {{{ xc_calc_string_n */ 
    131131REDEF(`KIND', `calc') 
    132 static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type, zstr str, long size IFASSERT(`, int relayline')) { 
     132static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type, const zstr str, long size IFASSERT(`, int relayline')) { 
    133133    pushdef(`__LINE__', `relayline') 
    134134    int realsize = UNISW(size, (type == IS_UNICODE) ? UBYTES(size) : size); 
    … …  
    152152/* {{{ xc_store_string_n */ 
    153153REDEF(`KIND', `store') 
    154 static inline zstr xc_store_string_n(xc_processor_t *processor, zend_uchar type, zstr str, long size IFASSERT(`, int relayline')) { 
     154static inline zstr xc_store_string_n(xc_processor_t *processor, zend_uchar type, const zstr str, long size IFASSERT(`, int relayline')) { 
    155155    pushdef(`__LINE__', `relayline') 
    156156    int realsize = UNISW(size, (type == IS_UNICODE) ? UBYTES(size) : size);