fix for using wxDataObjectComposite with the clipboard

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

diff --git a/src/common/parser.y b/src/common/parser.y
index 591c10c5513c28f21bfad922151db6c56f11644e..d81dd0ca969245cfcf5aee5a72b5ece33873be68 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>


@@ -78,14 +79,12 @@ command     :       WORD PERIOD
 
 expr   :       WORD OPEN arglist CLOSE 
                        {$$ = proio_cons(wxmake_word($1), $3); free($1);}
 
 expr   :       WORD OPEN arglist CLOSE 
                        {$$ = proio_cons(wxmake_word($1), $3); free($1);}

-       |       OPEN_SQUARE CLOSE_SQUARE
-                        {$$ = proio_cons(NULL, NULL);}

        |       OPEN_SQUARE arglist CLOSE_SQUARE
                        {$$ = $2; }
        ;
 
 arglist        :
        |       OPEN_SQUARE arglist CLOSE_SQUARE
                        {$$ = $2; }
        ;
 
 arglist        :

-                       {$$ = NULL;}
+                       {$$ = proio_cons(NULL, NULL);}

        |       arg
                        {$$ = proio_cons($1, NULL);}
        |
        |       arg
                        {$$ = proio_cons($1, NULL);}
        |


@@ -156,8 +155,11 @@ void yyerror(char *s)
  * the UNIX flex expects a proper function.
  */
 
  * 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
 #ifndef yywrap
 #define yywrap() 1
 #endif