diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l
index 0d93f5cba2f6aa0f383c7d8a8851b8ce90298b96..ab0d31ec461ad7578590bb6b8ab0da1540ccb96e 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
 
 %}
 
diff --git a/indra/lscript/lscript_compile/indra.y b/indra/lscript/lscript_compile/indra.y
index e4b10ffdd9da7d96dd1a75217a65de0964056a72..8df0e8ad830b0912487fcfe71ad586e146ab8931 100644
--- a/indra/lscript/lscript_compile/indra.y
+++ b/indra/lscript/lscript_compile/indra.y
@@ -2,8 +2,10 @@
 	#include "linden_common.h"
 	#include "lscript_tree.h"
 
-    #ifdef __cplusplus
+    #if !LL_DARWIN
+    #ifdef __cplusplus 
     extern "C" {
+    #endif
     #endif
 
 	int yylex(void);
@@ -20,9 +22,11 @@
 	#pragma warning( disable : 4065 )	// warning: switch statement contains 'default' but no 'case' labels
 	#endif
 
+    #if !LL_DARWIN
     #ifdef __cplusplus
     }
     #endif
+    #endif
 %}
 
 %union