diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-11 08:11:13 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-11 08:11:13 -0700 |
| commit | a0998157746d0429d5b8e75fea973c433dcfd3c4 (patch) | |
| tree | dd827016316a5e0fece141013e8018cd7f260268 /indra/lscript/lscript_compile | |
| parent | e413f4b335a2f4f5a1ca151c8ab67324a72ebaee (diff) | |
| parent | 9b632f060b7b9dcd33858b5c31d538760d0666ae (diff) | |
Merge vwr-dev-mat
Diffstat (limited to 'indra/lscript/lscript_compile')
| -rwxr-xr-x | indra/lscript/lscript_compile/indra.l | 8 | ||||
| -rwxr-xr-x | indra/lscript/lscript_compile/indra.y | 12 |
2 files changed, 0 insertions, 20 deletions
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l index 9132d5d528..1bb38bbf65 100755 --- a/indra/lscript/lscript_compile/indra.l +++ b/indra/lscript/lscript_compile/indra.l @@ -79,17 +79,9 @@ void parse_string(); #define yyfree indra_free -#if LL_WINDOWS -#if defined(__cplusplus) -extern "C" { int yylex( void ); } -extern "C" { int yyparse( void ); } -extern "C" { int yyerror(const char *fmt, ...); } -#endif -#else int yylex( void ); int yyparse( void ); int yyerror(const char *fmt, ...); -#endif %} diff --git a/indra/lscript/lscript_compile/indra.y b/indra/lscript/lscript_compile/indra.y index 9c2ed02f72..a0a034d21c 100755 --- a/indra/lscript/lscript_compile/indra.y +++ b/indra/lscript/lscript_compile/indra.y @@ -2,12 +2,6 @@ #include "linden_common.h" #include "lscript_tree.h" - #if LL_WINDOWS - #ifdef __cplusplus - extern "C" { - #endif - #endif - int yylex(void); int yyparse( void ); int yyerror(const char *fmt, ...); @@ -22,12 +16,6 @@ #pragma warning( disable : 4065 ) // warning: switch statement contains 'default' but no 'case' labels #endif - #if LL_WINDOWS - #ifdef __cplusplus - } - #endif - #endif - %} %union |