Fixes for WXWIN_COMPATIBILITY, and BC++ fix for event.cpp

[wxWidgets.git] / src / common / parser.y

diff --git a/src/common/parser.y b/src/common/parser.y
index 7600083ee7e17679adabf6d27ac2133c5b77008c..c834a77e534a10a844d3c956d817e87ac8c2b3f5 100644 (file)
--- a/src/common/parser.y
+++ b/src/common/parser.y
@@ -3,6 +3,9 @@
 #ifdef _MSC_VER
 #include <io.h>
 #endif
+#ifdef __GNUWIN32__
+#include <sys/unistd.h>
+#endif
 
 #include "wx/expr.h"
 
@@ -121,7 +124,7 @@ arg1        :       WORD
 
 %%
 
-#ifdef __WXGTK__
+#if (defined(__WXGTK__) || defined(__WXMOTIF__)) && !defined(NO_CONFIGURE)
 #include "lexer.c"
 #else
 #include "../common/lex_yy.c"
@@ -159,7 +162,7 @@ void yyerror(char *s)
 #ifndef yywrap
 #define yywrap() 1
 #endif
-#else if !defined(__alpha) && !defined(__ultrix)
+#else if !defined(__alpha___) && !defined(__ultrix)
 int yywrap() { return 1; }
 #endif
 #endif