From: Bob Weinand <bobwei9@hotmail.com>
Date: Sat, 21 Dec 2013 23:54:59 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.8RC1~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e3af096b3fb383826fc7d656ceb043590a56e70;p=php

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	Zend/zend_vm_opcodes.c
---

7e3af096b3fb383826fc7d656ceb043590a56e70
diff --cc Zend/zend_vm_opcodes.c
index 55a0de12e9,d5e7b826cb..c565510fac
--- 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[159] = {
 +const char *zend_vm_opcodes_map[164] = {
  	"ZEND_NOP",
  	"ZEND_ADD",
  	"ZEND_SUB",