diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-10-04 16:31:48 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-10-04 16:31:48 +0000 |
| commit | 4942a7b77917f9a163453ecdd040993965672cc0 (patch) | |
| tree | 3dd01f5e182d2eea2e34528cebe749d948a477fc /indra/lscript/lscript_compile/indra.l | |
| parent | 9fc7049151a16e3722c6ce90899e3c7b63161615 (diff) | |
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
Diffstat (limited to 'indra/lscript/lscript_compile/indra.l')
| -rw-r--r-- | indra/lscript/lscript_compile/indra.l | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l index a8fbcbe260..ee3492b071 100644 --- a/indra/lscript/lscript_compile/indra.l +++ b/indra/lscript/lscript_compile/indra.l @@ -9,13 +9,15 @@ FS (f|F) %p 5000 %{ -#include <stdio.h> -#include "stdtypes.h" +#include "linden_common.h" +// Deal with the fact that lex/yacc generates unreachable code +#ifdef LL_WINDOWS +#pragma warning (disable : 4702) // warning C4702: unreachable code +#endif // LL_WINDOWS #include "llmath.h" #include "lscript_tree.h" #include "lscript_typecheck.h" #include "lscript_resource.h" -#include "llfile.h" #if LL_WINDOWS #include "ytab.h" #else |