livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Karl Steifvater 2007-11-05 19:51:45 +00:00
parent 1e7917fa89
commit 6fd04521d7
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/lscript/lscript_compile/indra.l
View File

@ -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)