summaryrefslogtreecommitdiff
path: root/indra/lscript/lscript_compile/indra.l
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-07-18 18:43:58 -0400
committerMonty Brandenberg <monty@lindenlab.com>2013-07-18 18:43:58 -0400
commit38b3da4a20a0a06396d240a5e8fdc4fa11866937 (patch)
tree90613c999899253eb28caf04641b5ee41d827958 /indra/lscript/lscript_compile/indra.l
parentd027db3cfc7c757cc8846e1a5187d1a816f63d9a (diff)
parent6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff)
Merge. Refresh from viewer-release.
Diffstat (limited to 'indra/lscript/lscript_compile/indra.l')
-rwxr-xr-xindra/lscript/lscript_compile/indra.l8
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l
index b2c49083cb..1bb38bbf65 100755
--- a/indra/lscript/lscript_compile/indra.l
+++ b/indra/lscript/lscript_compile/indra.l
@@ -79,11 +79,9 @@ void parse_string();
#define yyfree indra_free
-#if defined(__cplusplus)
-extern "C" { int yylex( void ); }
-extern "C" { int yyparse( void ); }
-extern "C" { int yyerror(const char *fmt, ...); }
-#endif
+int yylex( void );
+int yyparse( void );
+int yyerror(const char *fmt, ...);
%}