X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88ac883a0d005437c97a60d8195bd5e4719b1154..ccf0b1d76ce28c0880df6d5c4866aaa548e2e56f:/src/common/parser.y

diff --git a/src/common/parser.y b/src/common/parser.y
index d02184cfd6..65ef760816 100644
--- a/src/common/parser.y
+++ b/src/common/parser.y
@@ -1,4 +1,5 @@
  %{
+#include "wx/setup.h"
 #include <string.h>
 #ifdef _MSC_VER
 #include <io.h>
@@ -119,7 +120,7 @@ arg1	:	WORD
 
 %%
 
-#if (defined(__WXGTK__) || defined(__WXMOTIF__)) && !defined(NO_CONFIGURE)
+#if (defined(__WXGTK__) || defined(__WXWINE__) || defined(__WXMOTIF__)) && !defined(NO_CONFIGURE)
 #include "lexer.c"
 #else
 #if (defined(__MWERKS__))
@@ -156,7 +157,9 @@ 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
@@ -164,4 +167,6 @@ void yyerror(char *s)
 #else if !defined(__alpha___) && !defined(__ultrix)
 int yywrap() { return 1; }
 #endif
+#elif defined(__WX_SETUP_H__)
+int yywrap() { return 1; }
 #endif