Included new .c file in build too

7 files changed, 14 insertions, 3 deletions

diff --git a/Zend/Makefile.am b/Zend/Makefile.am
index 5ec4590fef..7955badf6e 100644
--- a/Zend/Makefile.am
+++ b/Zend/Makefile.am
@@ -10,7 +10,7 @@ libZend_la_SOURCES=\
 	zend_ini_parser.y zend_ini_scanner.l \
 	zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
 	zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \
-	zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
+	zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
 	zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
 	zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
 	zend_ini.c zend_qsort.c zend_objects.c zend_object_handlers.c \
diff --git a/Zend/Zend.dsp b/Zend/Zend.dsp
index ebe01978c4..5e95b61d8d 100644
--- a/Zend/Zend.dsp
+++ b/Zend/Zend.dsp
@@ -257,6 +257,10 @@ SOURCE=.\zend_ts_hash.c
 

 SOURCE=.\zend_variables.c

 # End Source File

+# Begin Source File

+

+SOURCE=.\zend_vm_opcodes.c

+# End Source File

 # End Group

 # Begin Group "Header Files"

 

diff --git a/Zend/ZendTS.dsp b/Zend/ZendTS.dsp
index 3494cd4e17..bab134623a 100644
--- a/Zend/ZendTS.dsp
+++ b/Zend/ZendTS.dsp
@@ -287,6 +287,10 @@ SOURCE=.\zend_ts_hash.c
 

 SOURCE=.\zend_variables.c

 # End Source File

+# Begin Source File

+

+SOURCE=.\zend_vm_opcodes.c

+# End Source File

 # End Group

 # Begin Group "Header Files"

 

diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index 5621a60f0d..3f1c20cc04 100644
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -1219,6 +1219,7 @@ function gen_vm($def, $skel) {
 
 	// Insert header
 	out($f, $GLOBALS['header_text']);
+	fputs($f,"#include <stdio.h>\n\n");
 
 	fputs($f,"const char *zend_vm_opcodes_map[".($max_opcode + 1)."] = {\n");
 	for ($i = 0; $i <= $max_opcode; $i++) {
diff --git a/Zend/zend_vm_opcodes.c b/Zend/zend_vm_opcodes.c
index 88364bba67..d5e7b826cb 100644
--- a/Zend/zend_vm_opcodes.c
+++ b/Zend/zend_vm_opcodes.c
@@ -18,6 +18,8 @@
    +----------------------------------------------------------------------+
 */
 
+#include <stdio.h>
+
 const char *zend_vm_opcodes_map[159] = {
 	"ZEND_NOP",
 	"ZEND_ADD",
diff --git a/configure.in b/configure.in
index 8a6e9d7df5..a2cbe32efa 100644
--- a/configure.in
+++ b/configure.in
@@ -1467,7 +1467,7 @@ PHP_ADD_SOURCES(Zend, \
     zend_ini_parser.c zend_ini_scanner.c \
     zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c zend_dtrace.c \
     zend_execute_API.c zend_highlight.c zend_llist.c \
-    zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
+    zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
     zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
     zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
     zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 1a4b834be4..f025ae2f39 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -352,7 +352,7 @@ ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.c \
 	zend_ini_parser.c zend_ini_scanner.c zend_alloc.c zend_compile.c \
 	zend_constants.c zend_dynamic_array.c zend_exceptions.c \
 	zend_execute_API.c zend_highlight.c \
-	zend_llist.c zend_opcode.c zend_operators.c zend_ptr_stack.c \
+	zend_llist.c zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c \
 	zend_stack.c zend_variables.c zend.c zend_API.c zend_extensions.c \
 	zend_hash.c zend_list.c zend_indent.c zend_builtin_functions.c \
 	zend_sprintf.c zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c \