Ignore:
Timestamp:
2010-05-29T17:47:17+02:00 (3 years ago)
Author:
moo
Message:

merge r690 from trunk

Location:
branches/1.3
Files:
2 edited

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') 
Note: See TracChangeset for help on using the changeset viewer.