Committing in .

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

diff --git a/src/common/parser.y b/src/common/parser.y
index c9160bffa6f06562bb2ffc1f8d00175067c77af3..c922f8c04a8df2f8f1a419f2e019e6463b56e209 100644 (file)
--- a/src/common/parser.y
+++ b/src/common/parser.y
@@ -1,3 +1,4 @@
+/* Version: $Id$ */

  %{
 #include "wx/setup.h"
 #include <string.h>
  %{
 #include "wx/setup.h"
 #include <string.h>


@@ -96,6 +97,7 @@ arg   :       WORD EQUALS arg1
                          free($1); }
        |       arg1
                        {$$ = $1; }
                          free($1); }
        |       arg1
                        {$$ = $1; }

+       ;

 
 arg1   :       WORD
                        {$$ = wxmake_word($1); free($1);}
 
 arg1   :       WORD
                        {$$ = wxmake_word($1); free($1);}


@@ -123,13 +125,13 @@ arg1      :       WORD
  * for example, cross compilation. */
 #if (defined(__WXGTK__) || defined(__WXWINE__) || defined(__WXMOTIF__)) || defined(__WX_SETUP_H__) && !defined(NO_CONFIGURE)
 #include "lexer.c"
  * 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__))
+#elif defined(__WXMAC__) && defined(__APPLE__)
+#include "lexer.c"
+#elif defined(__MWERKS__)

 #include "../common/cwlex_yy.c"
 #else
 #include "../common/lex_yy.c"
 #endif
 #include "../common/cwlex_yy.c"
 #else
 #include "../common/lex_yy.c"
 #endif

-#endif

 
 /*
 void yyerror(s)
 
 /*
 void yyerror(s)