2.4.1 is safe

5 files changed, 61 insertions, 1 deletions

diff --git a/Zend/acinclude.m4 b/Zend/acinclude.m4
index 37068a316b..0abc75c76f 100644
--- a/Zend/acinclude.m4
+++ b/Zend/acinclude.m4
@@ -4,7 +4,7 @@ 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
diff --git a/Zend/zend_ini_scanner.c b/Zend/zend_ini_scanner.c
index 468e8d51cc..d3044f3dfe 100644
--- a/Zend/zend_ini_scanner.c
+++ b/Zend/zend_ini_scanner.c
@@ -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 @@
    +----------------------------------------------------------------------+
 */
 
+<<<<<<< zend_ini_scanner.c
+<<<<<<< zend_ini_scanner.c
+<<<<<<< zend_ini_scanner.c
 /* $Id$ */
+=======
+/* $Id$ */
+>>>>>>> 1.1.2.10
+=======
+/* $Id$ */
+>>>>>>> 1.1.2.12
+=======
+/* $Id$ */
+>>>>>>> 1.1.2.15
 
 #include <errno.h>
 #include "zend.h"
diff --git a/Zend/zend_ini_scanner_defs.h b/Zend/zend_ini_scanner_defs.h
index 46676e897b..9f0684d3df 100644
--- a/Zend/zend_ini_scanner_defs.h
+++ b/Zend/zend_ini_scanner_defs.h
@@ -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 {
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index 7f14dc72e3..9df1bf44ec 100644
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -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 @@
    +----------------------------------------------------------------------+
 */
 
+<<<<<<< zend_language_scanner.c
+<<<<<<< zend_language_scanner.c
 /* $Id$ */
+=======
+/* $Id$ */
+>>>>>>> 1.1.2.28
+=======
+/* $Id$ */
+>>>>>>> 1.1.2.31
 
 #if 0
 # define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c)
diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h
index e3d556fdaf..6b18749ea3 100644
--- a/Zend/zend_language_scanner_defs.h
+++ b/Zend/zend_language_scanner_defs.h
@@ -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 {