merge from trunk

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@724 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

processor/processor.m4

@@ -821,6 +821,13 @@ DEF_STRUCT_P_FUNC(`zend_op_array', , `dnl {{{
 	DONE(reserved)
 #if defined(HARDENING_PATCH) && HARDENING_PATCH
 	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);')
@@ -855,13 +862,6 @@ DEF_STRUCT_P_FUNC(`zend_op_array', , `dnl {{{
 				COPYNULL(prototype)
 			')
 	')
-#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