Changeset 886 for branches/1.3/processor/string.m4

Timestamp:

2012-04-05T15:37:21+02:00 (15 months ago)

Author:

moo

Message:

merge some changes from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• processor/string.m4 (modified) (3 diffs)

branches/1.3/processor/string.m4

@@ -21 +21 @@
             STRTYPE, `zstr_char',  `ZSTR_S($1)',
             `',      `',           `$1'))
-    pushdef(`U', ifelse(
-            PTRTYPE, `char',  `',
-            PTRTYPE, `UChar', `u'))
+    pushdef(`STRDUP', ifelse(
+            PTRTYPE, `char',  `estrndup',
+            PTRTYPE, `UChar', `eustrndup'))
     if (SRCPTR == NULL) {
         IFNOTMEMCPY(`IFCOPY(`
@@ -62 +62 @@
         IFSTORE(`DSTPTR = ifelse(PTRTYPE,`char',`ZSTR_S',`ZSTR_U')(xc_store_string_n(processor, ISTYPE, ZSTR(SRCSTR), $3 C_RELAYLINE));')
         IFRESTORE(`
-            DSTPTR = e`'U`'strndup(SRCPTR, ($3) - 1);
+            DSTPTR = STRDUP() (SRCPTR, ($3) - 1);
         ')
         FIXPOINTER_EX(`PTRTYPE', DSTPTR)
@@ -77 +77 @@
         ')
     }
-    popdef(`U')
+    popdef(`STRDUP')
     popdef(`DSTPTR')
     popdef(`SRCPTR')