com php-src: Included new .c file in build too: Zend/Makefile.am Zend/Zend.dsp Zend/ZendTS.dsp Zend/zend_vm_gen.php Zend /zend_vm_opcodes.c
configure.in win32/build/con fig.w32
| From: | Bob Weinand | Date: | Sat, 21 Dec 2013 23:52:05 +0000 |
| Subject: | com php-src: Included new .c file in build too: Zend/Makefile.am Zend/Zend.dsp Zend/ZendTS.dsp Zend/zend_vm_gen.php Zend /zend_vm_opcodes.c configure.in win32/build/con fig.w32 |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75385@lists.php.net to get a copy of this message | ||
Commit: 97bf25438526a2d4d60d4284bd12c1d40ae7134c
Author: Bob Weinand <bobwei9@hotmail.com> Sun, 22 Dec 2013 00:52:05 +0100
Parents: 61199be02f48232cf7b6a96c3a3d180e566d332a
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=97bf25438526a2d4d60d4284bd12c1d40ae7134c
Log:
Included new .c file in build too
Changed paths:
M Zend/Makefile.am
M Zend/Zend.dsp
M Zend/ZendTS.dsp
M Zend/zend_vm_gen.php
M Zend/zend_vm_opcodes.c
M configure.in
M win32/build/config.w32
Diff:
diff --git a/Zend/Makefile.am b/Zend/Makefile.am
index 5ec4590..7955bad 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 ebe0197..5e95b61 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 3494cd4..bab1346 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 5621a60..3f1c20c 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 88364bb...d5e7b82 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 8a6e9d7..a2cbe32 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 1a4b834..f025ae2 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 \