diff options
| author | Chris Want <cwant@ualberta.ca> | 2006-03-30 03:14:37 +0400 |
|---|---|---|
| committer | Chris Want <cwant@ualberta.ca> | 2006-03-30 03:14:37 +0400 |
| commit | 7fb2bf54303e32da79f631e89986507b5b81d46b (patch) | |
| tree | 3525458984c2af035f124a51ac6ec97b56ff8a66 /intern | |
| parent | a05b2090a9e791fbf7adba88b5fde2932f1a7b77 (diff) | |
==Nothing to see here, move along==
Try to get the yy_wrap and yy_parse definitions for IRIX. Hoping
that it will also help Kent's multiply resolved warnings, I've done
this so that these symbols are defined only if they are currently
undefined. I'm not sure if it will work though, please test!
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/elbeem/intern/cfglexer.cpp | 5 | ||||
| -rw-r--r-- | intern/elbeem/intern/cfgparser.cpp | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/intern/elbeem/intern/cfglexer.cpp b/intern/elbeem/intern/cfglexer.cpp index db5a077f3ff..2d99e429b60 100644 --- a/intern/elbeem/intern/cfglexer.cpp +++ b/intern/elbeem/intern/cfglexer.cpp @@ -815,7 +815,10 @@ char charBuffer[ CHAR_BUFFER_SIZE ]; int lineCount = 1; -/* extern "C" int yy_wrap (void ) { return 1; } */ +#ifndef yy_wrap +extern "C" int yy_wrap (void ) { return 1; } +#endif + #define YY_NO_UNISTD_H /*----------------------------------------------------------------------------*/ diff --git a/intern/elbeem/intern/cfgparser.cpp b/intern/elbeem/intern/cfgparser.cpp index c797a6da751..224c7d2787c 100644 --- a/intern/elbeem/intern/cfgparser.cpp +++ b/intern/elbeem/intern/cfgparser.cpp @@ -46,6 +46,13 @@ #define YYLSP_NEEDED 0 /* Substitute the variable and function names. */ + +#ifndef yy_parse +#define yyparse yy_parse +/* the parse function from bison */ +int yy_parse( void ); +#endif + #define yylex yy_lex #define yyerror yy_error #define yylval yy_lval @@ -294,9 +301,6 @@ extern int yy_lex(); extern int lineCount; extern FILE *yy_in; -/* the parse function from bison */ -extern int yy_parse( void ); - // local variables to access objects #include "solver_interface.h" #include "simulation_object.h" |