mirror of
https://github.com/php/php-src.git
synced 2024-12-01 13:54:10 +08:00
Merge branch 'PHP-5.5' into PHP-5.6
This commit is contained in:
commit
b14f31872b
@ -1215,7 +1215,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");
|
||||
}
|
||||
|
@ -169,7 +169,7 @@
|
||||
#define ZEND_FAST_RET 163
|
||||
#define ZEND_RECV_VARIADIC 164
|
||||
|
||||
const char *zend_vm_opcodes_map[] = {
|
||||
static const char *zend_vm_opcodes_map[] = {
|
||||
"ZEND_NOP",
|
||||
"ZEND_ADD",
|
||||
"ZEND_SUB",
|
||||
|
Loading…
Reference in New Issue
Block a user