From 9746cf5310871f305a1419163c5adfbed3f1534b Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Thu, 26 Jul 2007 01:22:23 +0000 Subject: EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/maintenance into release This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392 ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing) --- indra/lscript/lscript_compile/indra.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/lscript') diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l index 19c51b08b2..2ff1028f74 100644 --- a/indra/lscript/lscript_compile/indra.l +++ b/indra/lscript/lscript_compile/indra.l @@ -757,7 +757,7 @@ BOOL lscript_compile(char *filename, BOOL is_god_like = FALSE) S32 yywrap() { -#ifdef FLEX_SCANNER +#if defined(FLEX_SCANNER) && !defined(LL_WINDOWS) // get gcc to stop complaining about lack of use of yyunput (void) yyunput; #endif -- cgit v1.2.3