php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-19 22:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.4' into PHP-5.5

Browse Source 
Conflicts:
	Zend/zend_vm_gen.php
	Zend/zend_vm_opcodes.h
This commit is contained in:
Bob Weinand
2013-12-21 21:31:48 +01:00
parent b52c300eca 7894e397d8
commit 560f90e511
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend_vm_gen.php
View File

@@ -1188,7 +1188,7 @@ function gen_vm($def, $skel) {
fputs($f,"#define $op $code\n");
}
fputs($f,"\nconst char *zend_vm_opcodes_map[] = {\n");
fputs($f,"\nstatic const char *zend_vm_opcodes_map[] = {\n");
for ($i = 0; $i <= $max_opcode; $i++) {
fputs($f,"\t".(isset($opcodes[$i]["op"])?'"'.$opcodes[$i]["op"].'"':"NULL").",\n");
}

2
Zend/zend_vm_opcodes.h
View File

@@ -168,7 +168,7 @@
#define ZEND_FAST_CALL 162
#define ZEND_FAST_RET 163
const char *zend_vm_opcodes_map[] = {
static const char *zend_vm_opcodes_map[] = {
"ZEND_NOP",
"ZEND_ADD",
"ZEND_SUB",