summaryrefslogtreecommitdiff
path: root/indra/lscript/lscript_compile/indra.l
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-04-22 13:29:33 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-04-22 13:29:33 -0700
commit4bd3fef6f7018a0092c02aeba61af43265d12ceb (patch)
tree9686a06199a135515e493d47b9645133b1ccf67b /indra/lscript/lscript_compile/indra.l
parentb7235f1a4492bf4365d241e239eb49fb3ae8bb3e (diff)
MAINT-2612 fix issues between extern C linkage and yyval ifdefs on Mac with toolchain > 4.5.1
Diffstat (limited to 'indra/lscript/lscript_compile/indra.l')
-rw-r--r--indra/lscript/lscript_compile/indra.l8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l
index 0d93f5cba2..ab0d31ec46 100644
--- a/indra/lscript/lscript_compile/indra.l
+++ b/indra/lscript/lscript_compile/indra.l
@@ -79,11 +79,17 @@ void parse_string();
#define yyfree indra_free
+#if LL_DARWIN
+int yyparse( void );
+int yylex( void );
+int yyerror(const char *fmt, ...);
+#else
#if defined(__cplusplus)
-extern "C" { int yylex( void ); }
extern "C" { int yyparse( void ); }
+extern "C" { int yylex( void ); }
extern "C" { int yyerror(const char *fmt, ...); }
#endif
+#endif
%}