Merge branch 'PHP-5.5' into PHP-5.6

This commit is contained in:
Bob Weinand 2013-12-21 21:32:42 +01:00
commit b14f31872b
2 changed files with 2 additions and 2 deletions

View File

@ -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");
}

View File

@ -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",