drawing optimization fix

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

diff --git a/src/common/parser.y b/src/common/parser.y
index 1fb7dceb10c9be92d2c030a48a26a33677afc47e..c834a77e534a10a844d3c956d817e87ac8c2b3f5 100644 (file)
--- a/src/common/parser.y
+++ b/src/common/parser.y
@@ -1,5 +1,12 @@
  %{
 #include <string.h>
+#ifdef _MSC_VER
+#include <io.h>
+#endif
+#ifdef __GNUWIN32__
+#include <sys/unistd.h>
+#endif
+
 #include "wx/expr.h"
 
 #ifndef __EXTERN_C__
@@ -117,7 +124,11 @@ arg1       :       WORD
 
 %%
 
+#if (defined(__WXGTK__) || defined(__WXMOTIF__)) && !defined(NO_CONFIGURE)
+#include "lexer.c"
+#else
 #include "../common/lex_yy.c"
+#endif
 
 /*
 void yyerror(s)
@@ -151,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