Fixes for 16-bit compilation

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

diff --git a/src/common/parser.y b/src/common/parser.y
index 65ef760816198325d4a27d9656bdfef71d867c14..a4ff9ccc50c5389f014917b7ef3e6a4fac7b95ba 100644 (file)
--- a/src/common/parser.y
+++ b/src/common/parser.y
@@ -120,7 +120,10 @@ arg1       :       WORD
 
 %%
 
-#if (defined(__WXGTK__) || defined(__WXWINE__) || 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__))
@@ -164,7 +167,7 @@ void yyerror(char *s)
 #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__)