From f2455ccaafec1b583d714b119dd68ec8b4165519 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 10 May 2013 16:10:25 -0700
Subject: Put back normal map and spec map initializers/destruction, delete
 FMOD refs (unneeded with FMODEX), make indra.l/y safe for bison >= 2.7

---
 indra/lscript/lscript_compile/indra.y | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'indra/lscript/lscript_compile/indra.y')

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
-- 
cgit v1.2.3