sync zend_ini_scanner.c

diff --git a/Zend/zend_ini_scanner.c b/Zend/zend_ini_scanner.c
index 36a8fb2819372fb47cc2d489087cd2982d050199..cdfb6436326a42847c50a59d5b7c9e39d06bc240 100644 (file)
--- a/Zend/zend_ini_scanner.c
+++ b/Zend/zend_ini_scanner.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon Nov  3 00:36:23 2008 */
+/* Generated by re2c 0.13.5 on Wed Nov  5 22:35:51 2008 */
 #line 1 "Zend/zend_ini_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -190,7 +190,7 @@ int zend_ini_scanner_get_lineno(TSRMLS_D)
 */
 char *zend_ini_scanner_get_filename(TSRMLS_D)
 {
-       return ini_filename;
+       return ini_filename ? ini_filename : "Unknown";
 }
 /* }}} */
 
@@ -848,7 +848,7 @@ yy58:
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 483 "Zend/zend_ini_scanner.l"
                { /* #Comment */
-       zend_error(E_DEPRECATED, "Comments starting with '#' are deprecated in %s on line %d", ini_filename, SCNG(lineno));
+       zend_error(E_DEPRECATED, "Comments starting with '#' are deprecated in %s on line %d", zend_ini_scanner_get_filename(TSRMLS_C), SCNG(lineno));
        BEGIN(INITIAL);
        SCNG(lineno)++;
        return END_OF_LINE;

diff --git a/Zend/zend_ini_scanner_defs.h b/Zend/zend_ini_scanner_defs.h
index 66d91418f63c8b6aa47d792c75ef378ff5c33e94..97d3a07b4474f8ee4b3ef91c73dda2137251d206 100644 (file)
--- a/Zend/zend_ini_scanner_defs.h
+++ b/Zend/zend_ini_scanner_defs.h
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon Nov  3 00:36:23 2008 */
+/* Generated by re2c 0.13.5 on Wed Nov  5 22:35:51 2008 */
 #line 3 "Zend/zend_ini_scanner_defs.h"
 
 enum YYCONDTYPE {