diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2013-12-22 00:54:59 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2013-12-22 00:54:59 +0100 |
| commit | 7e3af096b3fb383826fc7d656ceb043590a56e70 (patch) | |
| tree | 6da0699ff3b944c236c94ec8dde54260be255517 | |
| parent | 00cc4dccb8aa710514e689fdafb922b5178e025f (diff) | |
| parent | 97bf25438526a2d4d60d4284bd12c1d40ae7134c (diff) | |
| download | php-git-7e3af096b3fb383826fc7d656ceb043590a56e70.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
Zend/zend_vm_opcodes.c
| -rw-r--r-- | Zend/Makefile.am | 2 | ||||
| -rw-r--r-- | Zend/Zend.dsp | 4 | ||||
| -rw-r--r-- | Zend/ZendTS.dsp | 4 | ||||
| -rw-r--r-- | Zend/zend_vm_gen.php | 1 | ||||
| -rw-r--r-- | Zend/zend_vm_opcodes.c | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | win32/build/config.w32 | 2 |
7 files changed, 14 insertions, 3 deletions
diff --git a/Zend/Makefile.am b/Zend/Makefile.am index 6417f3eb14..cea5c17fa2 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 23ebd4532b..61bdab0875 100644 --- a/Zend/Zend.dsp +++ b/Zend/Zend.dsp @@ -261,6 +261,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 3be2c58bed..0292fda667 100644 --- a/Zend/ZendTS.dsp +++ b/Zend/ZendTS.dsp @@ -291,6 +291,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 49023925f1..ea79833ecd 100644 --- a/Zend/zend_vm_gen.php +++ b/Zend/zend_vm_gen.php @@ -1198,6 +1198,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 55a0de12e9..c565510fac 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[164] = { "ZEND_NOP", "ZEND_ADD", diff --git a/configure.in b/configure.in index 722743cf50..18221517bc 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 3401205c8f..849a9372f7 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -357,7 +357,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 \ |