Various compile fixes.

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

diff --git a/src/common/parser.y b/src/common/parser.y
index 6cca59c6e772f35839164549036c324441d16fe0..a5dcdf37a78a6d8db1859d1a83fae19465b62cc5 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>
@@ -83,7 +84,7 @@ expr  :       WORD OPEN arglist CLOSE
        ;
 
 arglist        :
-                       {$$ = NULL;}
+                       {$$ = proio_cons(NULL, NULL);}
        |       arg
                        {$$ = proio_cons($1, NULL);}
        |
@@ -123,13 +124,13 @@ arg1      :       WORD
  * 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
-#endif
 
 /*
 void yyerror(s)
@@ -154,8 +155,11 @@ void yyerror(char *s)
  * the UNIX flex expects a proper function.
  */
 
-/* At least on alphaev6-dec-osf4.0e yywrap() must be #define'd */
-#if defined( __ALPHA__ ) && !defined( __VMS__ )
+/* At least on alphaev6-dec-osf4.0e yywrap() must be #define'd.
+ * RL: ... but on Debian/Alpha(linux) it must not, so hopefully
+ *     testing for __OSF__ here is what we really want.
+ */
+#ifdef __OSF__
 #ifndef yywrap
 #define yywrap() 1
 #endif