bad delete operator, should be delete [] for gs_FSMimeFallbacks and removing debug...

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

diff --git a/src/common/parser.y b/src/common/parser.y
index 65ef760816198325d4a27d9656bdfef71d867c14..591c10c5513c28f21bfad922151db6c56f11644e 100644 (file)
--- a/src/common/parser.y
+++ b/src/common/parser.y
@@ -120,7 +120,10 @@ arg1       :       WORD
 
 %%
 
 
 %%
 

-#if (defined(__WXGTK__) || defined(__WXWINE__) || defined(__WXMOTIF__)) && !defined(NO_CONFIGURE)
+/* We include lexer.c if we are building for gtk, wine or motif
+ * and also whenever we are using configure (marked by __WX_SETUP_H__) for,
+ * 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__))
 #include "lexer.c"
 #else
 #if (defined(__MWERKS__))


@@ -153,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__) 


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

-#else if !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
+