com php-src: Merge branch 'PHP-5.6': Zend/zend_vm_def.h Zend/zend_vm_execute.h Zend/zend_vm_opcodes.h
| From: | Nikita Popov | Date: | Sat, 11 Jan 2014 11:54:08 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': Zend/zend_vm_def.h Zend/zend_vm_execute.h Zend/zend_vm_opcodes.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75567@lists.php.net to get a copy of this message | ||
Commit: 4facc35413df3a12f15600be063ac2f6441bf58a
Author: Nikita Popov <nikic@php.net> Sat, 11 Jan 2014 12:54:08 +0100
Parents: 82dfe1acc88ccd5919f5040b341e2520dc809a7f 2c47dfbaebb203ab547f3c7e786cb1db5e84674a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4facc35413df3a12f15600be063ac2f6441bf58a
Log:
Merge branch 'PHP-5.6'
Changed paths:
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
MM Zend/zend_vm_opcodes.h
Diff:
diff --cc Zend/zend_vm_opcodes.h
index 50741d1,c4cab07..0f75196
--- a/Zend/zend_vm_opcodes.h
+++ b/Zend/zend_vm_opcodes.h
@@@ -170,5 -170,6 +170,6 @@@ ZEND_API const char *zend_get_opcode_na
#define ZEND_FAST_CALL 162
#define ZEND_FAST_RET 163
#define ZEND_RECV_VARIADIC 164
+ #define ZEND_SEND_UNPACK 165
-#endif
+#endif