MFZE1

diff --git a/Zend/flex.skl b/Zend/flex.skl
index 596c6dcddfa8d59657f59883f375eccd25a6ebc4..5d6ec00467110ad8cdb782a4b799fb16603afde6 100644 (file)
--- a/Zend/flex.skl
+++ b/Zend/flex.skl
@@ -321,6 +321,10 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
 %% code to copy yytext_ptr to yytext[] goes here, if %array
        yy_c_buf_p = yy_cp;
 
+#undef yyleng
+#undef yytext
+#undef yytext_ptr
+
 %% data tables for the DFA and the user's section 1 definitions go here
 
 /* Macros after this point can all be overridden by user definitions in

diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
index 5c802aa72cd1a961e4ca5c01a8c39c0f0ff5cf02..62522f3cc3a3f5513aeaada6dc0fd6517853cdb1 100644 (file)
--- a/Zend/zend_ini_scanner.l
+++ b/Zend/zend_ini_scanner.l
@@ -17,6 +17,10 @@
    +----------------------------------------------------------------------+
 */
 
+#define yyleng SCNG(yy_leng)
+#define yytext SCNG(yy_text)
+#define yytext_ptr SCNG(yy_text)
+
 #include "zend.h"
 #include "zend_globals.h"
 #include "zend_ini_parser.h"

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index ec491a2ca0641527bfb7ddeaca9c7ef259bc4bca..8b32edce17c85393911183dbcc30195e933dc528 100644 (file)
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -19,6 +19,10 @@
    +----------------------------------------------------------------------+
 */
 
+#define yyleng SCNG(yy_leng)
+#define yytext SCNG(yy_text)
+#define yytext_ptr SCNG(yy_text)
+
 %}
 
 %x ST_IN_SCRIPTING