Skip to content

Commit 6fc2eca

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch 'PHP-5.5'
2 parents 5ac3577 + eab1499 commit 6fc2eca

12 files changed

+16
-16
lines changed

‎Makefile.frag

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $(builddir)/zend_language_scanner.lo: $(srcdir)/zend_language_parser.h
77
$(builddir)/zend_ini_scanner.lo: $(srcdir)/zend_ini_parser.h
88

99
$(srcdir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
10-
@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l)
10+
@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l)
1111

1212
$(srcdir)/zend_language_parser.h: $(srcdir)/zend_language_parser.c
1313
$(srcdir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
@@ -18,6 +18,6 @@ $(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
1818
@$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@
1919

2020
$(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
21-
@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l)
21+
@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l)
2222

2323
$(builddir)/zend_indent.lo $(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h

‎Zend/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ zend_ini_scanner.lo: zend_ini_parser.h
3232
# Language parser/scanner rules
3333

3434
zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
35-
$(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt $(srcdir)/zend_language_scanner_defs.h -o$@ $(srcdir)/zend_language_scanner.l
35+
$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt $(srcdir)/zend_language_scanner_defs.h -o$@ $(srcdir)/zend_language_scanner.l
3636

3737
zend_language_parser.h: zend_language_parser.c
3838
zend_language_parser.c: $(srcdir)/zend_language_parser.y
@@ -44,7 +44,7 @@ zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
4444
$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o zend_ini_parser.c
4545

4646
zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
47-
$(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt $(srcdir)/zend_ini_scanner_defs.h -o$@ $(srcdir)/zend_ini_scanner.l
47+
$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt $(srcdir)/zend_ini_scanner_defs.h -o$@ $(srcdir)/zend_ini_scanner.l
4848

4949
zend_ini_parser.h: zend_ini_parser.c
5050

‎ext/date/lib/parse_date.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Generated by re2c 0.13.5 on Sun Sep 30 20:14:42 2012 */
1+
/* Generated by re2c 0.13.5 */
22
#line 1 "ext/date/lib/parse_date.re"
33
/*
44
+----------------------------------------------------------------------+

‎ext/date/lib/parse_iso_intervals.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Generated by re2c 0.13.5 on Mon Dec 5 22:02:35 2011 */
1+
/* Generated by re2c 0.13.5 */
22
#line 1 "ext/date/lib/parse_iso_intervals.re"
33
/*
44
+----------------------------------------------------------------------+

‎ext/pdo/Makefile.frag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ PDO_HEADER_FILES= \
66

77

88
$(srcdir)/pdo_sql_parser.c: $(srcdir)/pdo_sql_parser.re
9-
(cd $(top_srcdir); $(RE2C) -o ext/pdo/pdo_sql_parser.c ext/pdo/pdo_sql_parser.re)
9+
(cd $(top_srcdir); $(RE2C) --no-generation-date -o ext/pdo/pdo_sql_parser.c ext/pdo/pdo_sql_parser.re)
1010

1111
install-pdo-headers:
1212
@echo "Installing PDO headers: $(INSTALL_ROOT)$(phpincludedir)/ext/pdo/"

‎ext/pdo/pdo_sql_parser.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Generated by re2c 0.13.5 on Thu Apr 19 12:42:11 2012 */
1+
/* Generated by re2c 0.13.5 */
22
#line 1 "ext/pdo/pdo_sql_parser.re"
33
/*
44
+----------------------------------------------------------------------+

‎ext/phar/Makefile.frag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$(srcdir)/phar_path_check.c: $(srcdir)/phar_path_check.re
2-
@(cd $(top_srcdir); $(RE2C) -b -o ext/phar/phar_path_check.c ext/phar/phar_path_check.re)
2+
@(cd $(top_srcdir); $(RE2C) --no-generation-date -b -o ext/phar/phar_path_check.c ext/phar/phar_path_check.re)
33

44
pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
55

‎ext/phar/phar_path_check.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Generated by re2c 0.13.5 on Sun Jan 1 10:36:11 2012 */
1+
/* Generated by re2c 0.13.5 */
22
#line 1 "ext/phar/phar_path_check.re"
33
/*
44
+----------------------------------------------------------------------+

‎ext/standard/Makefile.frag

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
$(srcdir)/var_unserializer.c: $(srcdir)/var_unserializer.re
3-
@(cd $(top_srcdir); $(RE2C) -b -o ext/standard/var_unserializer.c ext/standard/var_unserializer.re)
3+
@(cd $(top_srcdir); $(RE2C) --no-generation-date -b -o ext/standard/var_unserializer.c ext/standard/var_unserializer.re)
44

55
$(srcdir)/url_scanner_ex.c: $(srcdir)/url_scanner_ex.re
6-
@(cd $(top_srcdir); $(RE2C) -b -o ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.re)
6+
@(cd $(top_srcdir); $(RE2C) --no-generation-date -b -o ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.re)
77

88
$(builddir)/info.lo: $(builddir)/../../main/build-defs.h
99

‎ext/standard/url_scanner_ex.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Generated by re2c 0.13.5 on Tue May 15 13:07:17 2012 */
1+
/* Generated by re2c 0.13.5 */
22
#line 1 "ext/standard/url_scanner_ex.re"
33
/*
44
+----------------------------------------------------------------------+

‎ext/standard/var_unserializer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Generated by re2c 0.13.5 on Sun Jan 1 10:36:31 2012 */
1+
/* Generated by re2c 0.13.5 */
22
#line 1 "ext/standard/var_unserializer.re"
33
/*
44
+----------------------------------------------------------------------+

‎win32/build/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ Zend\zend_language_parser.c Zend\zend_language_parser.h: Zend\zend_language_pars
5555

5656
!if $(RE2C) != ""
5757
Zend\zend_ini_scanner.c: Zend\zend_ini_scanner.l
58-
$(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l
58+
$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l
5959

6060
Zend\zend_language_scanner.c: Zend\zend_language_scanner.l
61-
$(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l
61+
$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l
6262
!endif
6363

6464
!if $(PGOMGR) != ""

0 commit comments

Comments
 (0)