Ignore:
Timestamp:
2010-05-29T17:47:17+02:00 (4 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/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); 
Note: See TracChangeset for help on using the changeset viewer.