From: Nikita Popov <nikic@php.net>
Date: Sat, 11 Jan 2014 11:54:08 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~388^2~65^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4facc35413df3a12f15600be063ac2f6441bf58a;p=php

Merge branch 'PHP-5.6'
---

4facc35413df3a12f15600be063ac2f6441bf58a
diff --cc Zend/zend_vm_opcodes.h
index 50741d1873,c4cab07aeb..0f75196ffb
--- 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