diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-06-05 07:24:31 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-06-05 07:24:31 -0700 |
| commit | 1fcf54094a915bbc7ec1d74a877699212714ae93 (patch) | |
| tree | c70712e2dabfd097272eca2440b1841e2d811070 /indra/lscript/lscript_compile | |
| parent | a45860fd662f4b0f6c10bf102ebf6c0aac5127f3 (diff) | |
BUG-2707 fix comment typos, remove unnecessary winmm_shim changes, and revert 2672 fix included only for local integ test
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 | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l index 1bb38bbf65..b2c49083cb 100755 --- a/indra/lscript/lscript_compile/indra.l +++ b/indra/lscript/lscript_compile/indra.l @@ -79,9 +79,11 @@ void parse_string(); #define yyfree indra_free -int yylex( void ); -int yyparse( void ); -int yyerror(const char *fmt, ...); +#if defined(__cplusplus) +extern "C" { int yylex( void ); } +extern "C" { int yyparse( void ); } +extern "C" { int yyerror(const char *fmt, ...); } +#endif %} diff --git a/indra/lscript/lscript_compile/indra.y b/indra/lscript/lscript_compile/indra.y index a0a034d21c..e4b10ffdd9 100755 --- a/indra/lscript/lscript_compile/indra.y +++ b/indra/lscript/lscript_compile/indra.y @@ -2,6 +2,10 @@ #include "linden_common.h" #include "lscript_tree.h" + #ifdef __cplusplus + extern "C" { + #endif + int yylex(void); int yyparse( void ); int yyerror(const char *fmt, ...); @@ -16,6 +20,9 @@ #pragma warning( disable : 4065 ) // warning: switch statement contains 'default' but no 'case' labels #endif + #ifdef __cplusplus + } + #endif %} %union |