diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2013-12-22 00:54:59 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2013-12-22 00:54:59 +0100 |
| commit | 7e3af096b3fb383826fc7d656ceb043590a56e70 (patch) | |
| tree | 6da0699ff3b944c236c94ec8dde54260be255517 /Zend/zend_vm_opcodes.c | |
| parent | 00cc4dccb8aa710514e689fdafb922b5178e025f (diff) | |
| parent | 97bf25438526a2d4d60d4284bd12c1d40ae7134c (diff) | |
| download | php-git-7e3af096b3fb383826fc7d656ceb043590a56e70.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
Zend/zend_vm_opcodes.c
Diffstat (limited to 'Zend/zend_vm_opcodes.c')
| -rw-r--r-- | Zend/zend_vm_opcodes.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_vm_opcodes.c b/Zend/zend_vm_opcodes.c index 55a0de12e9..c565510fac 100644 --- a/Zend/zend_vm_opcodes.c +++ b/Zend/zend_vm_opcodes.c @@ -18,6 +18,8 @@ +----------------------------------------------------------------------+ */ +#include <stdio.h> + const char *zend_vm_opcodes_map[164] = { "ZEND_NOP", "ZEND_ADD", |