Changeset 724

Timestamp:

2011-04-09T14:55:48+02:00 (2 years ago)

Author:

moo

Message:

merge from trunk

File:

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

trunk/processor/processor.m4

@@ -823 +823 @@
     DISPATCH(zend_bool, created_by_eval)
 #endif
+#ifdef ZEND_ENGINE_2_4
+    DISPATCH(int, last_literal)
+    IFRESTORE(`COPY(literals)', `STRUCT_ARRAY(last_literal, zend_literal, literals)')
+
+    COPYNULL(run_time_cache)
+    COPYNULL(last_cache_slot)
+#endif
     } while (0);
     IFRESTORE(`xc_fix_op_array_info(processor->entry_src, processor->php_src, dst, !shallow_copy, op_array_info TSRMLS_CC);')
@@ -856 +863 @@
             ')
     ')
-#ifdef ZEND_ENGINE_2_4
-    DISPATCH(int, last_literal)
-    IFRESTORE(`COPY(literals)', `STRUCT_ARRAY(last_literal, zend_literal, literals)')
-
-    COPYNULL(run_time_cache)
-    COPYNULL(last_cache_slot)
-#endif
 
 #endif