diff options
author | Oz Linden <oz@lindenlab.com> | 2013-06-17 16:50:35 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-06-17 16:50:35 -0400 |
commit | 761bf254a4e72ec521ff1a52ac12f8594a350818 (patch) | |
tree | c72f84bb4ac319c10299a35934b52a09a73a127d /indra/lscript/lscript_compile/indra.l | |
parent | a2fa9a2bc26bb67c0bb952d3295c380dcb853eb5 (diff) | |
parent | 1e41b017e1713a35eb68190d279cf8d28791b6d2 (diff) |
merge changes for 3.6.0-release
Diffstat (limited to 'indra/lscript/lscript_compile/indra.l')
-rwxr-xr-x | indra/lscript/lscript_compile/indra.l | 8 |
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, ...); %} |