From: Stanislav Malyshev <stas@php.net>
Date: Mon, 7 Jul 2014 05:15:35 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.15RC1~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c291033469920fa2155b3b1833731a0aa93257c3;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Make sure the generator script also creates a newline at the end of file
  Add newline at end of file to prevent compilation warning
---

c291033469920fa2155b3b1833731a0aa93257c3
diff --cc Zend/zend_vm_opcodes.h
index 911eee4434,5e4bf4d05a..4ed726d217
--- a/Zend/zend_vm_opcodes.h
+++ b/Zend/zend_vm_opcodes.h
@@@ -164,10 -164,5 +164,10 @@@ ZEND_API const char *zend_get_opcode_na
  #define ZEND_SEPARATE                        156
  #define ZEND_QM_ASSIGN_VAR                   157
  #define ZEND_JMP_SET_VAR                     158
 +#define ZEND_DISCARD_EXCEPTION               159
 +#define ZEND_YIELD                           160
 +#define ZEND_GENERATOR_RETURN                161
 +#define ZEND_FAST_CALL                       162
 +#define ZEND_FAST_RET                        163
  
- #endif
+ #endif