diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-26 09:02:31 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-26 09:02:31 -0700 |
| commit | 3834cb6f8ae768a58b3b718eff5ae670a0c299f5 (patch) | |
| tree | 1e683524bea895029e1cf108f6ec12aaf0cb11c4 /indra/lscript | |
| parent | b130308d1c021357523f29614f9382e39e991076 (diff) | |
Fix linux breakage from sunshine merge
Diffstat (limited to 'indra/lscript')
| -rwxr-xr-x | indra/lscript/lscript_compile/indra.l | 6 | ||||
| -rwxr-xr-x | indra/lscript/lscript_compile/indra.y | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l index b2c49083cb..9132d5d528 100755 --- 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_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 e4b10ffdd9..9c2ed02f72 100755 --- a/indra/lscript/lscript_compile/indra.y +++ b/indra/lscript/lscript_compile/indra.y @@ -2,9 +2,11 @@ #include "linden_common.h" #include "lscript_tree.h" + #if LL_WINDOWS #ifdef __cplusplus extern "C" { #endif + #endif int yylex(void); int yyparse( void ); @@ -20,9 +22,12 @@ #pragma warning( disable : 4065 ) // warning: switch statement contains 'default' but no 'case' labels #endif + #if LL_WINDOWS #ifdef __cplusplus } #endif + #endif + %} %union |