Skip to content

Commit 7e3af09

Browse files
committed
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts: Zend/zend_vm_opcodes.c
2 parents 00cc4dc + 97bf254 commit 7e3af09

File tree

7 files changed

+14
-3
lines changed

7 files changed

+14
-3
lines changed

Zend/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ libZend_la_SOURCES=\
1010
zend_ini_parser.y zend_ini_scanner.l \
1111
zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
1212
zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \
13-
zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
13+
zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
1414
zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
1515
zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
1616
zend_ini.c zend_qsort.c zend_objects.c zend_object_handlers.c \

Zend/Zend.dsp

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Zend/ZendTS.dsp

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Zend/zend_vm_gen.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,6 +1198,7 @@ function gen_vm($def, $skel) {
11981198

11991199
// Insert header
12001200
out($f, $GLOBALS['header_text']);
1201+
fputs($f,"#include <stdio.h>\n\n");
12011202

12021203
fputs($f,"const char *zend_vm_opcodes_map[".($max_opcode + 1)."] = {\n");
12031204
for ($i = 0; $i <= $max_opcode; $i++) {

Zend/zend_vm_opcodes.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
+----------------------------------------------------------------------+
1919
*/
2020

21+
#include <stdio.h>
22+
2123
const char *zend_vm_opcodes_map[164] = {
2224
"ZEND_NOP",
2325
"ZEND_ADD",

configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1467,7 +1467,7 @@ PHP_ADD_SOURCES(Zend, \
14671467
zend_ini_parser.c zend_ini_scanner.c \
14681468
zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c zend_dtrace.c \
14691469
zend_execute_API.c zend_highlight.c zend_llist.c \
1470-
zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
1470+
zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
14711471
zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
14721472
zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
14731473
zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \

win32/build/config.w32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.c \
357357
zend_ini_parser.c zend_ini_scanner.c zend_alloc.c zend_compile.c \
358358
zend_constants.c zend_dynamic_array.c zend_exceptions.c \
359359
zend_execute_API.c zend_highlight.c \
360-
zend_llist.c zend_opcode.c zend_operators.c zend_ptr_stack.c \
360+
zend_llist.c zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c \
361361
zend_stack.c zend_variables.c zend.c zend_API.c zend_extensions.c \
362362
zend_hash.c zend_list.c zend_indent.c zend_builtin_functions.c \
363363
zend_sprintf.c zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c \

0 commit comments

Comments
 (0)