From 6fd04521d720a3a4904069d10e8ed970d870ba7f Mon Sep 17 00:00:00 2001
From: Karl Steifvater <qarl@lindenlab.com>
Date: Mon, 5 Nov 2007 19:51:45 +0000
Subject: [PATCH] merge -r71488:71881
svn+ssh://svn.lindenlab.com/svn/linden/branches/flex-bison --> release
---
indra/lscript/lscript_compile/indra.l | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l
index ee3492b0714..57aef07e184 100644
--- a/indra/lscript/lscript_compile/indra.l
+++ b/indra/lscript/lscript_compile/indra.l
@@ -651,14 +651,6 @@ int yyerror(const char *fmt, ...)
return 0;
}
-#define LL_MKS_YACC 1
-#if LL_WINDOWS && LL_MKS_YACC
-int yyinput(void)
-{
- return input();
-}
-#endif
-
//#define EMERGENCY_DEBUG_PRINTOUTS
//#define EMIT_CIL_ASSEMBLER
@@ -685,11 +677,9 @@ BOOL lscript_compile(const char* src_filename, const char* dst_filename,
yyout = LLFile::fopen(err_filename, "w");
// Reset the lexer's internal buffering.
-#if LL_DARWIN || LL_LINUX || !LL_MKS_YACC
- yyrestart(yyin);
-#else
- yy_reset();
-#endif
+
+ yyrestart(yyin);
+
b_parse_ok = !yyparse();
if (b_parse_ok)
--
GitLab