Fixed problems with the wxDb::Open(wxDb *copyDb) not copying in all the different...

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

diff --git a/src/common/parser.y b/src/common/parser.y
index a4ff9ccc50c5389f014917b7ef3e6a4fac7b95ba..591c10c5513c28f21bfad922151db6c56f11644e 100644 (file)
--- a/src/common/parser.y
+++ b/src/common/parser.y
@@ -156,10 +156,12 @@ void yyerror(char *s)
  * the UNIX flex expects a proper function.
  */
 
  * the UNIX flex expects a proper function.
  */
 

-/* Not sure if __SC__ is the appropriate thing
- * to test
- */
-
+/* At least on alphaev6-dec-osf4.0e yywrap() must be #define'd */
+#if defined( __ALPHA__ ) && !defined( __VMS__ )
+#ifndef yywrap
+#define yywrap() 1
+#endif
+#else

 /* HH: Added test for __WX_SETUP_H__ for gnuwin builds
  * using configure */ 
 #if !defined(__SC__) && !defined(__GNUWIN32__) 
 /* HH: Added test for __WX_SETUP_H__ for gnuwin builds
  * using configure */ 
 #if !defined(__SC__) && !defined(__GNUWIN32__) 


@@ -167,9 +169,13 @@ void yyerror(char *s)
 #ifndef yywrap
 #define yywrap() 1
 #endif
 #ifndef yywrap
 #define yywrap() 1
 #endif

-#elif !defined(__alpha___) && !defined(__alpha) && !defined(__ultrix)
+#elif !defined(__ultrix)
+int yywrap() { return 1; }
+#elif defined(__VMS__)

 int yywrap() { return 1; }
 #endif
 #elif defined(__WX_SETUP_H__)
 int yywrap() { return 1; }
 #endif
 int yywrap() { return 1; }
 #endif
 #elif defined(__WX_SETUP_H__)
 int yywrap() { return 1; }
 #endif

+#endif
+