Commit: a6ab00743533e45a636f37c77c175c5169fe8c34 Author: Dmitry Stogov <dmi...@zend.com> Wed, 14 Nov 2012 18:42:12 +0400 Parents: 45b9ae5f835a645ee8fcfc8055a3aa3bd3d257d5 ba8a06fd95ed4bce920569b4c9f8e71f927bd498 Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a6ab00743533e45a636f37c77c175c5169fe8c34 Log: Merge branch 'PHP-5.5' * PHP-5.5: Fixed compiler reenterability Fixed compiler reenterability Changed paths: MM Zend/zend_language_scanner.c MM Zend/zend_language_scanner_defs.h Diff: diff --cc Zend/zend_language_scanner.c index 07ccb5d,48be8ea..f456b97 --- 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 47df7e9,de220af..9906feb --- 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 { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
