diff options
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" |