summaryrefslogtreecommitdiff
path: root/indra/lscript/lscript_compile
diff options
context:
space:
mode:
Diffstat (limited to 'indra/lscript/lscript_compile')
-rwxr-xr-xindra/lscript/lscript_compile/indra.l8
-rwxr-xr-xindra/lscript/lscript_compile/indra.y7
2 files changed, 12 insertions, 3 deletions
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l
index 1bb38bbf65..b2c49083cb 100755
--- a/indra/lscript/lscript_compile/indra.l
+++ b/indra/lscript/lscript_compile/indra.l
@@ -79,9 +79,11 @@ void parse_string();
#define yyfree indra_free
-int yylex( void );
-int yyparse( void );
-int yyerror(const char *fmt, ...);
+#if defined(__cplusplus)
+extern "C" { int yylex( void ); }
+extern "C" { int yyparse( void ); }
+extern "C" { int yyerror(const char *fmt, ...); }
+#endif
%}
diff --git a/indra/lscript/lscript_compile/indra.y b/indra/lscript/lscript_compile/indra.y
index a0a034d21c..e4b10ffdd9 100755
--- a/indra/lscript/lscript_compile/indra.y
+++ b/indra/lscript/lscript_compile/indra.y
@@ -2,6 +2,10 @@
#include "linden_common.h"
#include "lscript_tree.h"
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+
int yylex(void);
int yyparse( void );
int yyerror(const char *fmt, ...);
@@ -16,6 +20,9 @@
#pragma warning( disable : 4065 ) // warning: switch statement contains 'default' but no 'case' labels
#endif
+ #ifdef __cplusplus
+ }
+ #endif
%}
%union