diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-10 16:10:25 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-10 16:10:25 -0700 |
| commit | f2455ccaafec1b583d714b119dd68ec8b4165519 (patch) | |
| tree | b936569bf9d72742ef3af82f4aa8c4097f20ad8f /indra/lscript/lscript_compile/indra.y | |
| parent | d2f71df15f14fe0f7e17f962d39d19dd571fc530 (diff) | |
Put back normal map and spec map initializers/destruction, delete FMOD refs (unneeded with FMODEX), make indra.l/y safe for bison >= 2.7
Diffstat (limited to 'indra/lscript/lscript_compile/indra.y')
| -rw-r--r-- | indra/lscript/lscript_compile/indra.y | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/indra/lscript/lscript_compile/indra.y b/indra/lscript/lscript_compile/indra.y index 9c2ed02f72..a0a034d21c 100644 --- a/indra/lscript/lscript_compile/indra.y +++ b/indra/lscript/lscript_compile/indra.y @@ -2,12 +2,6 @@ #include "linden_common.h" #include "lscript_tree.h" - #if LL_WINDOWS - #ifdef __cplusplus - extern "C" { - #endif - #endif - int yylex(void); int yyparse( void ); int yyerror(const char *fmt, ...); @@ -22,12 +16,6 @@ #pragma warning( disable : 4065 ) // warning: switch statement contains 'default' but no 'case' labels #endif - #if LL_WINDOWS - #ifdef __cplusplus - } - #endif - #endif - %} %union |