Changeset 4 for trunk/processor/processor.m4

Timestamp:

05/13/2006 01:54:55 AM (3 years ago)

Author:

moo

Message:

compatibility fix: remove the using of gnu m4 extension

Files:

• trunk/processor/processor.m4 (modified) (5 diffs)

trunk/processor/processor.m4

@@ -184 +184 @@
                 dnl fprintf(stderr, "copy from %p to %p\n", src[0], dst[0]);
             ')
-            STRUCT_P_EX(zval, dst[0], src[0], `', ` ')
+            STRUCT_P_EX(zval, dst[0], src[0], `[0]', `', ` ')
         } while (0);
     ')
@@ -284 +284 @@
         if (src->num_interfaces) {
             CALLOC(dst->interfaces, zend_class_entry*, src->num_interfaces)
+            DONE(`interfaces')
         }
         else {
-            COPYNULL_EX(dst->interfaces)
+            COPYNULL(interfaces)
         }
     ')
@@ -302 +303 @@
             add_assoc_zval_ex(dst, ZEND_STRS("interfaces"), arr);
             */
+            DONE(`interfaces')
         }
         else {
-            COPYNULL_EX(dst->interfaces)
-        }
-    ')
-    DONE(`interfaces')
+            COPYNULL(interfaces)
+        }
+    ')
+    IFRESTORE(`', `
+        IFDASM(`', `
+            DONE(`interfaces')
+        ')
+    ')
     DISPATCH(zend_uint, num_interfaces)
 
@@ -534 +540 @@
     dnl zend_cv.m4 is illegal to be made public, don not ask me for it
     IFDASM(`
-        sinclude(`zend_cv.m4')
+        sinclude(srcdir`/processor/zend_cv.m4')
         ')
 #endif
@@ -647 +653 @@
         }
     ')
-    STRUCT_P_EX(zval_ptr, dst->value, src->value, `', `&')
+    STRUCT_P_EX(zval_ptr, dst->value, src->value, `value', `', `&')
     DONE(value)
 ')