Changeset 690 in svn

Timestamp:

2010-05-29T15:39:00Z (7 years ago)

Author:

Xuefer

Message:

fix build by avoing nested macro with ifdef

Location:

trunk/processor

Files:

• head.m4 (modified) (1 diff)
• main.m4 (modified) (1 diff)
• string.m4 (modified) (1 diff)

trunk/processor/head.m4

@@ -135 +135 @@
 /* {{{ xc_calc_string_n */
 REDEF(`KIND', `calc')
+#undef C_RELAYLINE
+#define C_RELAYLINE
+IFASSERT(`
+#undef C_RELAYLINE
+#define C_RELAYLINE , __LINE__
+')
 static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type, const zstr str, long size IFASSERT(`, int relayline')) {
     pushdef(`__LINE__', `relayline')

trunk/processor/main.m4

@@ -122 +122 @@
 ')
 dnl }}}
+dnl {{{ IFASSERTEX
+define(`IFASSERTEX', `ifdef(`XCACHE_ENABLE_TEST', `$1', `$2')')
+dnl }}}
 dnl {{{ IFASSERT
-define(`IFASSERT', `ifdef(`XCACHE_ENABLE_TEST', `
+define(`IFASSERT', `IFASSERTEX(`
 #ifndef NDEBUG
         $1

trunk/processor/string.m4

@@ -59 +59 @@
             ')
         ')
-        IFCALC(`xc_calc_string_n(processor, ISTYPE, SRCSTR, $3 IFASSERT(`, __LINE__'));')
-        IFSTORE(`DSTPTR = ifelse(PTRTYPE,`char',`ZSTR_S',`ZSTR_U')(xc_store_string_n(processor, ISTYPE, SRCSTR, $3 IFASSERT(`, __LINE__')));')
+        IFCALC(`xc_calc_string_n(processor, ISTYPE, SRCSTR, $3 C_RELAYLINE);')
+        IFSTORE(`DSTPTR = ifelse(PTRTYPE,`char',`ZSTR_S',`ZSTR_U')(xc_store_string_n(processor, ISTYPE, SRCSTR, $3 C_RELAYLINE));')
         IFRESTORE(`
             DSTPTR = e`'U`'strndup(SRCPTR, ($3) - 1);