X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf62af352e4573b5307be6ff8997c58a376a1959..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/common/parser.y diff --git a/src/common/parser.y b/src/common/parser.y index 6cca59c6e7..a5dcdf37a7 100644 --- a/src/common/parser.y +++ b/src/common/parser.y @@ -1,3 +1,4 @@ +/* Version: $Id$ */ %{ #include "wx/setup.h" #include @@ -83,7 +84,7 @@ expr : WORD OPEN arglist CLOSE ; arglist : - {$$ = NULL;} + {$$ = proio_cons(NULL, NULL);} | arg {$$ = proio_cons($1, NULL);} | @@ -123,13 +124,13 @@ arg1 : WORD * for example, cross compilation. */ #if (defined(__WXGTK__) || defined(__WXWINE__) || defined(__WXMOTIF__)) || defined(__WX_SETUP_H__) && !defined(NO_CONFIGURE) #include "lexer.c" -#else -#if (defined(__MWERKS__)) +#elif defined(__WXMAC__) && defined(__APPLE__) +#include "lexer.c" +#elif defined(__MWERKS__) #include "../common/cwlex_yy.c" #else #include "../common/lex_yy.c" #endif -#endif /* void yyerror(s) @@ -154,8 +155,11 @@ void yyerror(char *s) * the UNIX flex expects a proper function. */ -/* At least on alphaev6-dec-osf4.0e yywrap() must be #define'd */ -#if defined( __ALPHA__ ) && !defined( __VMS__ ) +/* At least on alphaev6-dec-osf4.0e yywrap() must be #define'd. + * RL: ... but on Debian/Alpha(linux) it must not, so hopefully + * testing for __OSF__ here is what we really want. + */ +#ifdef __OSF__ #ifndef yywrap #define yywrap() 1 #endif