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.y | |
| 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.y')
| -rw-r--r-- | indra/lscript/lscript_compile/indra.y | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/lscript/lscript_compile/indra.y b/indra/lscript/lscript_compile/indra.y index 56f40c974c..d10cbfedba 100644 --- a/indra/lscript/lscript_compile/indra.y +++ b/indra/lscript/lscript_compile/indra.y @@ -1,7 +1,7 @@ %{ - #include "stdtypes.h" + #include "linden_common.h" #include "lscript_tree.h" - + #ifdef __cplusplus extern "C" { #endif @@ -16,6 +16,7 @@ #endif #ifdef LL_WINDOWS + #pragma warning (disable : 4702) // warning C4702: unreachable code #pragma warning( disable : 4065 ) // warning: switch statement contains 'default' but no 'case' labels #endif |