From 4942a7b77917f9a163453ecdd040993965672cc0 Mon Sep 17 00:00:00 2001 From: Aaron Brashears Date: Thu, 4 Oct 2007 16:31:48 +0000 Subject: Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release. --- indra/lscript/lscript_compile/indra.l | 8 +++++--- indra/lscript/lscript_compile/indra.y | 5 +++-- indra/lscript/lscript_compile/lscript_error.h | 3 --- indra/lscript/lscript_compile/lscript_resource.h | 2 -- indra/lscript/lscript_compile/lscript_tree.h | 2 -- 5 files changed, 8 insertions(+), 12 deletions(-) (limited to 'indra/lscript/lscript_compile') 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 -#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 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 diff --git a/indra/lscript/lscript_compile/lscript_error.h b/indra/lscript/lscript_compile/lscript_error.h index 4ad7b60dd8..9e76b9a4d7 100644 --- a/indra/lscript/lscript_compile/lscript_error.h +++ b/indra/lscript/lscript_compile/lscript_error.h @@ -9,11 +9,8 @@ #ifndef LL_LSCRIPT_ERROR_H #define LL_LSCRIPT_ERROR_H -#include -#include "stdtypes.h" #include "lscript_scope.h" - typedef enum e_lscript_compile_pass { LSCP_INVALID, diff --git a/indra/lscript/lscript_compile/lscript_resource.h b/indra/lscript/lscript_compile/lscript_resource.h index b0a38b81fb..36de4786c6 100644 --- a/indra/lscript/lscript_compile/lscript_resource.h +++ b/indra/lscript/lscript_compile/lscript_resource.h @@ -9,8 +9,6 @@ #ifndef LL_LSCRIPT_RESOURCE_H #define LL_LSCRIPT_RESOURCE_H -#include -#include "stdtypes.h" #include "lscript_scope.h" void init_temp_jumps(); diff --git a/indra/lscript/lscript_compile/lscript_tree.h b/indra/lscript/lscript_compile/lscript_tree.h index d0e8bcf389..a1fe4f4d09 100644 --- a/indra/lscript/lscript_compile/lscript_tree.h +++ b/indra/lscript/lscript_compile/lscript_tree.h @@ -9,8 +9,6 @@ #ifndef LL_LSCRIPT_TREE_H #define LL_LSCRIPT_TREE_H -#include -#include "stdtypes.h" #include "v3math.h" #include "llquaternion.h" #include "linked_lists.h" -- cgit v1.2.3