From: Bob Weinand <bobwei9@hotmail.com>
Date: Sat, 21 Dec 2013 20:32:42 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~105
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b14f31872bd94d7c0d58048a4500dae868022324;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

b14f31872bd94d7c0d58048a4500dae868022324
diff --cc Zend/zend_vm_opcodes.h
index 663e216183,18bb0d27f7..672f223bdd
--- a/Zend/zend_vm_opcodes.h
+++ b/Zend/zend_vm_opcodes.h
@@@ -167,9 -167,8 +167,9 @@@
  #define ZEND_GENERATOR_RETURN                161
  #define ZEND_FAST_CALL                       162
  #define ZEND_FAST_RET                        163
 +#define ZEND_RECV_VARIADIC                   164
  
- const char *zend_vm_opcodes_map[] = {
+ static const char *zend_vm_opcodes_map[] = {
  	"ZEND_NOP",
  	"ZEND_ADD",
  	"ZEND_SUB",