]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Sat, 11 Jan 2014 11:54:08 +0000 (12:54 +0100)
committerNikita Popov <nikic@php.net>
Sat, 11 Jan 2014 11:54:08 +0000 (12:54 +0100)
1  2 
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Zend/zend_vm_opcodes.h

Simple merge
Simple merge
index 50741d1873ec106d2ed0ac0a3925691c6f7ba1cb,c4cab07aeb3a9845261ee7473bb311ddd941b95a..0f75196ffb205badbad6a07975df00f5b99e2fae
@@@ -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