From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 14 Nov 2012 14:42:12 +0000 (+0400)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~709^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6ab00743533e45a636f37c77c175c5169fe8c34;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed compiler reenterability
  Fixed compiler reenterability
---

a6ab00743533e45a636f37c77c175c5169fe8c34
diff --cc Zend/zend_language_scanner.c
index 07ccb5d751,48be8eaf7d..f456b97d94
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@@ -1,4 -1,4 +1,4 @@@
- /* Generated by re2c 0.13.5 on Mon Aug 20 13:34:50 2012 */
 -/* Generated by re2c 0.13.5 on Wed Nov 14 17:50:16 2012 */
++/* Generated by re2c 0.13.5 on Wed Nov 14 18:04:29 2012 */
  #line 1 "Zend/zend_language_scanner.l"
  /*
     +----------------------------------------------------------------------+
diff --cc Zend/zend_language_scanner_defs.h
index 47df7e92de,de220af71b..9906febe30
--- a/Zend/zend_language_scanner_defs.h
+++ b/Zend/zend_language_scanner_defs.h
@@@ -1,4 -1,4 +1,4 @@@
- /* Generated by re2c 0.13.5 on Mon Aug 20 13:34:50 2012 */
 -/* Generated by re2c 0.13.5 on Wed Nov 14 17:50:16 2012 */
++/* Generated by re2c 0.13.5 on Wed Nov 14 18:04:29 2012 */
  #line 3 "Zend/zend_language_scanner_defs.h"
  
  enum YYCONDTYPE {