Merge branch 'PHP-5.4' into PHP-5.5

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

Original file line number	Diff line number	Diff line change
`@@ -1188,7 +1188,7 @@ function gen_vm($def, $skel) {`
`1188`	`1188`	`fputs($f,"#define $op $code\n");`
`1189`	`1189`	`}`
`1190`	`1190`
`1191`		`- fputs($f,"\nconst char *zend_vm_opcodes_map[] = {\n");`
	`1191`	`+ fputs($f,"\nstatic const char *zend_vm_opcodes_map[] = {\n");`
`1192`	`1192`	`for ($i = 0; $i <= $max_opcode; $i++) {`
`1193`	`1193`	`fputs($f,"\t".(isset($opcodes[$i]["op"])?'"'.$opcodes[$i]["op"].'"':"NULL").",\n");`
`1194`	`1194`	`}`