Temp. fix for ..\..\zlib problem.

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

diff --git a/src/common/parser.y b/src/common/parser.y
index 16b9b2c33facc96a61476206c80170fc3357c489..ee3db0f8ec4b8d2ad6dbd43474036aade179110a 100644 (file)
--- 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>
@@ -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__)
@@ -73,7 +69,7 @@ commands :    /* empty */
        ;
 
 command        :       WORD PERIOD
-                       {process_command(proio_cons(make_word($1), NULL)); free($1);}
+                       {process_command(proio_cons(wxmake_word($1), NULL)); free($1);}
         |       expr PERIOD
                        {process_command($1);}
        |       error PERIOD
@@ -81,7 +77,7 @@ command       :       WORD PERIOD
        ;
 
 expr   :       WORD OPEN arglist CLOSE 
-                       {$$ = proio_cons(make_word($1), $3); free($1);}
+                       {$$ = proio_cons(wxmake_word($1), $3); free($1);}
        |       OPEN_SQUARE CLOSE_SQUARE
                         {$$ = proio_cons(NULL, NULL);}
        |       OPEN_SQUARE arglist CLOSE_SQUARE
@@ -98,24 +94,24 @@ arglist     :
        ;
 
 arg    :       WORD EQUALS arg1
-                       {$$ = proio_cons(make_word("="), proio_cons(make_word($1), proio_cons($3, NULL)));
+                       {$$ = proio_cons(wxmake_word("="), proio_cons(wxmake_word($1), proio_cons($3, NULL)));
                          free($1); }
        |       arg1
                        {$$ = $1; }
 
 arg1   :       WORD
-                       {$$ = make_word($1); free($1);}
+                       {$$ = wxmake_word($1); free($1);}
        |       STRING
-                       {$$ = make_string($1); free($1);}
+                       {$$ = wxmake_string($1); free($1);}
        |       INTEGER
-                       {$$ = make_integer($1); free($1);}
+                       {$$ = wxmake_integer($1); free($1);}
        |       INTEGER PERIOD INTEGER
-                       {$$ = make_real($1, $3); free($1); free($3); }
+                       {$$ = wxmake_real($1, $3); free($1); free($3); }
         |       INTEGER EXP INTEGER
-                         {$$ = make_exp($1, $3); free($1); free($3); }
+                         {$$ = wxmake_exp($1, $3); free($1); free($3); }
         |
               INTEGER PERIOD INTEGER EXP INTEGER
-                         {$$ = make_exp2($1, $3, $5); free($1); free($3);
+                         {$$ = wxmake_exp2($1, $3, $5); free($1); free($3);
                                                                   free($5); }
 
        |       expr
@@ -124,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__))
@@ -161,7 +157,7 @@ void yyerror(char *s)
  * to test
  */
 
-#ifndef __SC__
+#if !defined(__SC__) && !defined(__GNUWIN32__)
 #ifdef USE_DEFINE
 #ifndef yywrap
 #define yywrap() 1