Changeset 690 for trunk


Ignore:
Timestamp:
2010-05-29T17:39:00+02:00 (5 years ago)
Author:
moo
Message:

fix build by avoing nested macro with ifdef

Location:
trunk/processor
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/head.m4

    r684 r690  
    135135/* {{{ xc_calc_string_n */ 
    136136REDEF(`KIND', `calc') 
     137#undef C_RELAYLINE 
     138#define C_RELAYLINE 
     139IFASSERT(` 
     140#undef C_RELAYLINE 
     141#define C_RELAYLINE , __LINE__ 
     142') 
    137143static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type, const zstr str, long size IFASSERT(`, int relayline')) { 
    138144    pushdef(`__LINE__', `relayline') 
  • trunk/processor/main.m4

    r662 r690  
    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 
  • trunk/processor/string.m4

    r662 r690  
    5959            ') 
    6060        ') 
    61         IFCALC(`xc_calc_string_n(processor, ISTYPE, SRCSTR, $3 IFASSERT(`, __LINE__'));') 
    62         IFSTORE(`DSTPTR = ifelse(PTRTYPE,`char',`ZSTR_S',`ZSTR_U')(xc_store_string_n(processor, ISTYPE, SRCSTR, $3 IFASSERT(`, __LINE__')));') 
     61        IFCALC(`xc_calc_string_n(processor, ISTYPE, SRCSTR, $3 C_RELAYLINE);') 
     62        IFSTORE(`DSTPTR = ifelse(PTRTYPE,`char',`ZSTR_S',`ZSTR_U')(xc_store_string_n(processor, ISTYPE, SRCSTR, $3 C_RELAYLINE));') 
    6363        IFRESTORE(` 
    6464            DSTPTR = e`'U`'strndup(SRCPTR, ($3) - 1); 
Note: See TracChangeset for help on using the changeset viewer.