Skip to content
Snippets Groups Projects
Commit 6fd04521 authored by Karl Steifvater's avatar Karl Steifvater
Browse files

merge -r71488:71881 svn+ssh://svn.lindenlab.com/svn/linden/branches/flex-bison --> release

parent 1e7917fa
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/lscript/lscript_compile/indra.l
+ 3
− 13
View file @ 6fd04521
...@@ -651,14 +651,6 @@ int yyerror(const char *fmt, ...) ...@@ -651,14 +651,6 @@ int yyerror(const char *fmt, ...)
return 0; return 0;
} }
#define LL_MKS_YACC 1
#if LL_WINDOWS && LL_MKS_YACC
int yyinput(void)
{
return input();
}
#endif
//#define EMERGENCY_DEBUG_PRINTOUTS //#define EMERGENCY_DEBUG_PRINTOUTS
//#define EMIT_CIL_ASSEMBLER //#define EMIT_CIL_ASSEMBLER
...@@ -685,11 +677,9 @@ BOOL lscript_compile(const char* src_filename, const char* dst_filename, ...@@ -685,11 +677,9 @@ BOOL lscript_compile(const char* src_filename, const char* dst_filename,
yyout = LLFile::fopen(err_filename, "w"); yyout = LLFile::fopen(err_filename, "w");
// Reset the lexer's internal buffering. // Reset the lexer's internal buffering.
#if LL_DARWIN || LL_LINUX || !LL_MKS_YACC
yyrestart(yyin); yyrestart(yyin);
#else
yy_reset();
#endif
b_parse_ok = !yyparse(); b_parse_ok = !yyparse();
if (b_parse_ok) if (b_parse_ok)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment