Index: trunk/optimizer.c
===================================================================
--- trunk/optimizer.c	(revision 716)
+++ trunk/optimizer.c	(revision 822)
@@ -19,4 +19,10 @@
 #else
 #	define XCACHE_IS_CV 16
+#endif
+
+#ifdef ZEND_ENGINE_2_4
+#	undef Z_OP_CONSTANT
+/* Z_OP_CONSTANT is used before pass_two is applied */
+#	define Z_OP_CONSTANT(op) op_array->literals[op.constant].constant
 #endif