Changeset 691

Show
Ignore:
Timestamp:
05/29/2010 05:47:17 PM (3 years ago)
Author:
moo
Message:

merge r690 from trunk

Location:
branches/1.3
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 690

  • branches/1.3/processor/head.m4

    r646 r691  
    130130/* {{{ xc_calc_string_n */ 
    131131REDEF(`KIND', `calc') 
     132#undef C_RELAYLINE 
     133#define C_RELAYLINE 
     134IFASSERT(` 
     135#undef C_RELAYLINE 
     136#define C_RELAYLINE , __LINE__ 
     137') 
    132138static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type, const zstr str, long size IFASSERT(`, int relayline')) { 
    133139    pushdef(`__LINE__', `relayline') 

  • branches/1.3/processor/main.m4

    r626 r691  
    122122') 
    123123dnl }}} 
     124dnl {{{ IFASSERTEX 
     125define(`IFASSERTEX', `ifdef(`XCACHE_ENABLE_TEST', `$1', `$2')') 
     126dnl }}} 
    124127dnl {{{ IFASSERT 
    125 define(`IFASSERT', `ifdef(`XCACHE_ENABLE_TEST', ` 
     128define(`IFASSERT', `IFASSERTEX(` 
    126129#ifndef NDEBUG 
    127130        $1 

  • branches/1.3/processor/string.m4

    r646 r691  
    5959            ') 
    6060        ') 
    61         IFCALC(`xc_calc_string_n(processor, ISTYPE, ZSTR(SRCSTR), $3 IFASSERT(`, __LINE__'));') 
    62         IFSTORE(`DSTPTR = ifelse(PTRTYPE,`char',`ZSTR_S',`ZSTR_U')(xc_store_string_n(processor, ISTYPE, ZSTR(SRCSTR), $3 IFASSERT(`, __LINE__')));') 
     61        IFCALC(`xc_calc_string_n(processor, ISTYPE, ZSTR(SRCSTR), $3 C_RELAYLINE);') 
     62        IFSTORE(`DSTPTR = ifelse(PTRTYPE,`char',`ZSTR_S',`ZSTR_U')(xc_store_string_n(processor, ISTYPE, ZSTR(SRCSTR), $3 C_RELAYLINE));') 
    6363        IFRESTORE(` 
    6464            DSTPTR = e`'U`'strndup(SRCPTR, ($3) - 1);