com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/Makefile.am Zend/Zend.dsp Zend/ZendTS.dsp Zend/zend_vm_gen.php Zend /zend_vm_opcodes.c
configure.in win32/build/con fig.w32
| From: | Bob Weinand | Date: | Sat, 21 Dec 2013 23:55:46 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/Makefile.am Zend/Zend.dsp Zend/ZendTS.dsp Zend/zend_vm_gen.php Zend /zend_vm_opcodes.c configure.in win32/build/con fig.w32 |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75387@lists.php.net to get a copy of this message | ||
Commit: 129fb22b37e6689cef38f436c277d49f4f24a8bb
Author: Bob Weinand <bobwei9@hotmail.com> Sun, 22 Dec 2013 00:55:46 +0100
Parents: 2874eba714770265d97961f5644a0cc02ba8526c 7e3af096b3fb383826fc7d656ceb043590a56e70
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=129fb22b37e6689cef38f436c277d49f4f24a8bb
Log:
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
Zend/zend_vm_opcodes.c
Changed paths:
MM Zend/Makefile.am
MM Zend/Zend.dsp
MM Zend/ZendTS.dsp
MM Zend/zend_vm_gen.php
MM Zend/zend_vm_opcodes.c
MM configure.in
MM win32/build/config.w32
Diff:
diff --cc Zend/zend_vm_opcodes.c
index aa292d3,c565510..04af26c
--- a/Zend/zend_vm_opcodes.c
+++ b/Zend/zend_vm_opcodes.c
@@@ -18,7 -18,9 +18,9 @@@
+----------------------------------------------------------------------+
*/
+ #include <stdio.h>
+
-const char *zend_vm_opcodes_map[164] = {
+const char *zend_vm_opcodes_map[165] = {
"ZEND_NOP",
"ZEND_ADD",
"ZEND_SUB",