From: Zeev Suraski <zeev@php.net>
Date: Thu, 16 Aug 2001 20:38:56 +0000 (+0000)
Subject: MFZE1
X-Git-Tag: PRE_SUBST_Z_MACROS~492
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77c52275a1293ded4bc93467cce10f9c09c799e7;p=php

MFZE1
---

diff --git a/Zend/flex.skl b/Zend/flex.skl
index 596c6dcddf..5d6ec00467 100644
--- 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 5c802aa72c..62522f3cc3 100644
--- 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 ec491a2ca0..8b32edce17 100644
--- 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