diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2009-02-14 21:08:02 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2009-02-14 21:08:02 +0000 |
| commit | 70ecb3074a707a7c19b0900fc7bbac02a5b30149 (patch) | |
| tree | 3eff3dea43665712fcc6a822c18549b1fc5bed08 /Zend/zend_ini_scanner.c | |
| parent | ca63494a395845ca794140c03464ae037740182c (diff) | |
| download | php-git-70ecb3074a707a7c19b0900fc7bbac02a5b30149.tar.gz | |
2.4.1 is safe
Diffstat (limited to 'Zend/zend_ini_scanner.c')
| -rw-r--r-- | Zend/zend_ini_scanner.c | 24 |
1 files changed, 24 insertions, 0 deletions
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" |