diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2013-12-21 21:31:48 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2013-12-21 21:31:48 +0100 |
| commit | 560f90e5117b94bf16e6698e372e981d7bbb38e5 (patch) | |
| tree | 4699eb9348c29693b2fd142cf30aec4777db0945 | |
| parent | b52c300ecad2637732551b45f0819f2d7cb3ccf1 (diff) | |
| parent | 7894e397d83a1ecaddd06732171d5bf28c2265fb (diff) | |
| download | php-git-560f90e5117b94bf16e6698e372e981d7bbb38e5.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
Zend/zend_vm_gen.php
Zend/zend_vm_opcodes.h
| -rw-r--r-- | Zend/zend_vm_gen.php | 2 | ||||
| -rw-r--r-- | Zend/zend_vm_opcodes.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php index e0e2817994..3eddeefbeb 100644 --- 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 index 2ca7f84c5c..18bb0d27f7 100644 --- 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", |