cvs: ZendEngine2(PHP_5_3) / acinclude.m4 zend_ini_scanner.c zend_ini_scanner_defs.h zend_language_scanner.c zend_language_scanner_defs.h
[email protected] ("Rasmus Lerdorf") Sat, 14 Feb 2009 21:08:03 -0000
| Newsgroups | php.zend-engine.cvs |
|---|---|
| Message-ID | <cvsrasmus1234645683@cvsserver> |
rasmus Sat Feb 14 21:08:03 2009 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2 acinclude.m4 zend_ini_scanner.c
zend_ini_scanner_defs.h zend_language_scanner.c
zend_language_scanner_defs.h
Log:
2.4.1 is safe
http://cvs.php.net/viewvc.cgi/ZendEngine2/acinclude.m4?r1=1.15.2.2.2.2.2.3&r2=1.15.2.2.2.2.2.4&diff_format=u
Index: ZendEngine2/acinclude.m4
diff -u ZendEngine2/acinclude.m4:1.15.2.2.2.2.2.3 ZendEngine2/acinclude.m4:1.15.2.2.2.2.2.4
--- ZendEngine2/acinclude.m4:1.15.2.2.2.2.2.3 Tue Dec 2 21:06:50 2008
+++ ZendEngine2/acinclude.m4 Sat Feb 14 21:08:00 2009
@@ -1,10 +1,10 @@
-dnl $Id: acinclude.m4,v 1.15.2.2.2.2.2.3 2008/12/02 21:06:50 cseiler Exp $
+dnl $Id: acinclude.m4,v 1.15.2.2.2.2.2.4 2009/02/14 21:08:00 rasmus Exp $
dnl
dnl This file contains local autoconf functions.
AC_DEFUN([LIBZEND_BISON_CHECK],[
# we only support certain bison versions
- bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4"
+ bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1"
# for standalone build of Zend Engine
test -z "$SED" && SED=sed
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner.c?r1=1.1.2.15&r2=1.1.2.16&diff_format=u
Index: ZendEngine2/zend_ini_scanner.c
diff -u ZendEngine2/zend_ini_scanner.c:1.1.2.15 ZendEngine2/zend_ini_scanner.c:1.1.2.16
--- ZendEngine2/zend_ini_scanner.c:1.1.2.15 Mon Feb 2 19:23:38 2009
+++ ZendEngine2/zend_ini_scanner.c Sat Feb 14 21:08:00 2009
@@ -1,4 +1,16 @@
+<<<<<<< zend_ini_scanner.c
+<<<<<<< zend_ini_scanner.c
+<<<<<<< zend_ini_scanner.c
+/* Generated by re2c 0.13.5 on Fri Aug 29 13:01:39 2008 */
+=======
+/* Generated by re2c 0.13.5 on Wed Sep 10 18:54:04 2008 */
+>>>>>>> 1.1.2.10
+=======
+/* Generated by re2c 0.13.5 on Wed Nov 5 22:35:51 2008 */
+>>>>>>> 1.1.2.12
+=======
/* Generated by re2c 0.13.6.dev on Mon Feb 2 19:23:18 2009 */
+>>>>>>> 1.1.2.15
#line 1 "Zend/zend_ini_scanner.l"
/*
+----------------------------------------------------------------------+
@@ -22,7 +34,19 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_ini_scanner.c,v 1.1.2.15 2009/02/02 19:23:38 nlopess Exp $ */
+<<<<<<< zend_ini_scanner.c
+<<<<<<< zend_ini_scanner.c
+<<<<<<< zend_ini_scanner.c
+/* $Id: zend_ini_scanner.c,v 1.1.2.16 2009/02/14 21:08:00 rasmus Exp $ */
+=======
+/* $Id: zend_ini_scanner.c,v 1.1.2.16 2009/02/14 21:08:00 rasmus Exp $ */
+>>>>>>> 1.1.2.10
+=======
+/* $Id: zend_ini_scanner.c,v 1.1.2.16 2009/02/14 21:08:00 rasmus Exp $ */
+>>>>>>> 1.1.2.12
+=======
+/* $Id: zend_ini_scanner.c,v 1.1.2.16 2009/02/14 21:08:00 rasmus Exp $ */
+>>>>>>> 1.1.2.15
#include <errno.h>
#include "zend.h"
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner_defs.h?r1=1.1.2.12&r2=1.1.2.13&diff_format=u
Index: ZendEngine2/zend_ini_scanner_defs.h
diff -u ZendEngine2/zend_ini_scanner_defs.h:1.1.2.12 ZendEngine2/zend_ini_scanner_defs.h:1.1.2.13
--- ZendEngine2/zend_ini_scanner_defs.h:1.1.2.12 Mon Feb 2 19:23:38 2009
+++ ZendEngine2/zend_ini_scanner_defs.h Sat Feb 14 21:08:01 2009
@@ -1,4 +1,16 @@
+<<<<<<< zend_ini_scanner_defs.h
+<<<<<<< zend_ini_scanner_defs.h
+<<<<<<< zend_ini_scanner_defs.h
+/* Generated by re2c 0.13.5 on Fri Aug 29 13:01:39 2008 */
+=======
+/* Generated by re2c 0.13.5 on Wed Sep 10 18:54:04 2008 */
+>>>>>>> 1.1.2.8
+=======
+/* Generated by re2c 0.13.5 on Wed Nov 5 22:35:51 2008 */
+>>>>>>> 1.1.2.10
+=======
/* Generated by re2c 0.13.6.dev on Mon Feb 2 19:23:18 2009 */
+>>>>>>> 1.1.2.12
#line 3 "Zend/zend_ini_scanner_defs.h"
enum YYCONDTYPE {
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.c?r1=1.1.2.31&r2=1.1.2.32&diff_format=u
Index: ZendEngine2/zend_language_scanner.c
diff -u ZendEngine2/zend_language_scanner.c:1.1.2.31 ZendEngine2/zend_language_scanner.c:1.1.2.32
--- ZendEngine2/zend_language_scanner.c:1.1.2.31 Fri Jan 9 17:21:12 2009
+++ ZendEngine2/zend_language_scanner.c Sat Feb 14 21:08:01 2009
@@ -1,4 +1,12 @@
+<<<<<<< zend_language_scanner.c
+<<<<<<< zend_language_scanner.c
+/* Generated by re2c 0.13.5 on Fri Aug 29 13:01:13 2008 */
+=======
+/* Generated by re2c 0.13.6.dev on Tue Nov 4 01:40:34 2008 */
+>>>>>>> 1.1.2.28
+=======
/* Generated by re2c 0.13.5 on Fri Jan 9 12:08:49 2009 */
+>>>>>>> 1.1.2.31
#line 1 "Zend/zend_language_scanner.l"
/*
+----------------------------------------------------------------------+
@@ -23,7 +31,15 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_scanner.c,v 1.1.2.31 2009/01/09 17:21:12 iliaa Exp $ */
+<<<<<<< zend_language_scanner.c
+<<<<<<< zend_language_scanner.c
+/* $Id: zend_language_scanner.c,v 1.1.2.32 2009/02/14 21:08:01 rasmus Exp $ */
+=======
+/* $Id: zend_language_scanner.c,v 1.1.2.32 2009/02/14 21:08:01 rasmus Exp $ */
+>>>>>>> 1.1.2.28
+=======
+/* $Id: zend_language_scanner.c,v 1.1.2.32 2009/02/14 21:08:01 rasmus Exp $ */
+>>>>>>> 1.1.2.31
#if 0
# define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner_defs.h?r1=1.1.2.21&r2=1.1.2.22&diff_format=u
Index: ZendEngine2/zend_language_scanner_defs.h
diff -u ZendEngine2/zend_language_scanner_defs.h:1.1.2.21 ZendEngine2/zend_language_scanner_defs.h:1.1.2.22
--- ZendEngine2/zend_language_scanner_defs.h:1.1.2.21 Fri Jan 9 17:21:12 2009
+++ ZendEngine2/zend_language_scanner_defs.h Sat Feb 14 21:08:02 2009
@@ -1,4 +1,12 @@
+<<<<<<< zend_language_scanner_defs.h
+<<<<<<< zend_language_scanner_defs.h
+/* Generated by re2c 0.13.5 on Fri Aug 29 13:01:13 2008 */
+=======
+/* Generated by re2c 0.13.6.dev on Tue Nov 4 01:40:34 2008 */
+>>>>>>> 1.1.2.20
+=======
/* Generated by re2c 0.13.5 on Fri Jan 9 12:08:49 2009 */
+>>>>>>> 1.1.2.21
#line 3 "Zend/zend_language_scanner_defs.h"
enum YYCONDTYPE {