Merge branch 'PHP-5.6'

bwoebi · bwoebi · commit 0cc89be244e0 · 2013-12-21T21:33:15.000+01:00
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
@@ -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");
 	}
diff --git a/Zend/zend_vm_opcodes.h b/Zend/zend_vm_opcodes.h
@@ -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",

Original file line number	Diff line number	Diff line change
`@@ -1215,7 +1215,7 @@ function gen_vm($def, $skel) {`
`1215`	`1215`	`fputs($f,"#define $op $code\n");`
`1216`	`1216`	`}`
`1217`	`1217`
`1218`		`- fputs($f,"\nconst char *zend_vm_opcodes_map[] = {\n");`
	`1218`	`+ fputs($f,"\nstatic const char *zend_vm_opcodes_map[] = {\n");`
`1219`	`1219`	`for ($i = 0; $i <= $max_opcode; $i++) {`
`1220`	`1220`	`fputs($f,"\t".(isset($opcodes[$i]["op"])?'"'.$opcodes[$i]["op"].'"':"NULL").",\n");`
`1221`	`1221`	`}`