diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-06-19 14:06:06 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-06-19 14:06:06 -0700 |
| commit | 7da4c651911743707c0cc7cd4bebdcefb52eb379 (patch) | |
| tree | 6f99d83a2b2bf3de810dd5a1191a47f7cc53ac9d /indra/lscript | |
| parent | f1e594feceb8ab284e023e164d5410cd53a656cb (diff) | |
| parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/lscript')
| -rwxr-xr-x | indra/lscript/lscript_compile/indra.l | 8 | ||||
| -rwxr-xr-x | indra/lscript/lscript_compile/indra.y | 7 |
2 files changed, 3 insertions, 12 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, ...); %} diff --git a/indra/lscript/lscript_compile/indra.y b/indra/lscript/lscript_compile/indra.y index e4b10ffdd9..a0a034d21c 100755 --- a/indra/lscript/lscript_compile/indra.y +++ b/indra/lscript/lscript_compile/indra.y @@ -2,10 +2,6 @@ #include "linden_common.h" #include "lscript_tree.h" - #ifdef __cplusplus - extern "C" { - #endif - int yylex(void); int yyparse( void ); int yyerror(const char *fmt, ...); @@ -20,9 +16,6 @@ #pragma warning( disable : 4065 ) // warning: switch statement contains 'default' but no 'case' labels #endif - #ifdef __cplusplus - } - #endif %} %union |