summaryrefslogtreecommitdiff
path: root/indra/lscript/lscript_compile/indra.y
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-06-19 12:24:44 -0700
committerMerov Linden <merov@lindenlab.com>2013-06-19 12:24:44 -0700
commitb3c010ea7130331d454c480b82d1309bac712004 (patch)
tree8f5e2ba709ebd52400f2831785e0c07c3396815f /indra/lscript/lscript_compile/indra.y
parentd65f09ebcafe6ca968236a9991961983d4cd7a47 (diff)
parent2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff)
Pull merge lindenlab/viewer-release
Diffstat (limited to 'indra/lscript/lscript_compile/indra.y')
-rwxr-xr-xindra/lscript/lscript_compile/indra.y7
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/lscript/lscript_compile/indra.y b/indra/lscript/lscript_compile/indra.y
index e4b10ffdd9..a0a034d21c 100755
--- a/indra/lscript/lscript_compile/indra.y
+++ b/indra/lscript/lscript_compile/indra.y
@@ -2,10 +2,6 @@
#include "linden_common.h"
#include "lscript_tree.h"
- #ifdef __cplusplus
- extern "C" {
- #endif
-
int yylex(void);
int yyparse( void );
int yyerror(const char *fmt, ...);
@@ -20,9 +16,6 @@
#pragma warning( disable : 4065 ) // warning: switch statement contains 'default' but no 'case' labels
#endif
- #ifdef __cplusplus
- }
- #endif
%}
%union