summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2001-08-16 20:38:56 +0000
committerZeev Suraski <zeev@php.net>2001-08-16 20:38:56 +0000
commit77c52275a1293ded4bc93467cce10f9c09c799e7 (patch)
tree679d77d8a08c701a1e789fb7b72a4f5eaf534972
parentc1a8854993e5c7a2c252cdfb3f641eeb706ea93d (diff)
downloadphp-git-77c52275a1293ded4bc93467cce10f9c09c799e7.tar.gz
MFZE1
-rw-r--r--Zend/flex.skl4
-rw-r--r--Zend/zend_ini_scanner.l4
-rw-r--r--Zend/zend_language_scanner.l4
3 files changed, 12 insertions, 0 deletions
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