X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b077d483bcd47bcd1c3e89a9adc1d6b1a44e046..6842d18650b487249b4ae29d0d7e17231b24cde8:/src/common/parser.y diff --git a/src/common/parser.y b/src/common/parser.y index d9ae9b194b..a4ff9ccc50 100644 --- a/src/common/parser.y +++ b/src/common/parser.y @@ -1,4 +1,5 @@ %{ +#include "wx/setup.h" #include #ifdef _MSC_VER #include @@ -27,12 +28,7 @@ void yyerror(char *); /* You may need to put /DLEX_SCANNER in your makefile * if you're using LEX! */ -#ifdef LEX_SCANNER -/* int yyoutput(int); */ void yyoutput(int); -#else -void yyoutput(int); -#endif #if defined(__cplusplus) || defined(__STDC__) #if defined(__cplusplus) && defined(__EXTERN_C__) @@ -124,7 +120,10 @@ arg1 : WORD %% -#if (defined(__WXGTK__) || defined(__WXMOTIF__)) && !defined(NO_CONFIGURE) +/* We include lexer.c if we are building for gtk, wine or motif + * and also whenever we are using configure (marked by __WX_SETUP_H__) for, + * 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__)) @@ -161,12 +160,16 @@ void yyerror(char *s) * to test */ -#ifndef __SC__ +/* HH: Added test for __WX_SETUP_H__ for gnuwin builds + * using configure */ +#if !defined(__SC__) && !defined(__GNUWIN32__) #ifdef USE_DEFINE #ifndef yywrap #define yywrap() 1 #endif -#else if !defined(__alpha___) && !defined(__ultrix) +#elif !defined(__alpha___) && !defined(__alpha) && !defined(__ultrix) int yywrap() { return 1; } #endif +#elif defined(__WX_SETUP_H__) +int yywrap() { return 1; } #endif