applied patch for compilation with gcc 3.0

[wxWidgets.git] / src / xpm / xpm.h

diff --git a/src/xpm/xpm.h b/src/xpm/xpm.h
index f53ff82ec37ba16016fef103df0fa12d50ba6d50..333b09d12242369884c7ee4b5b6c376ca6358844 100644 (file)
--- a/src/xpm/xpm.h
+++ b/src/xpm/xpm.h
@@ -101,6 +101,12 @@ typedef unsigned long Pixel;       /* Index into colormap */
 # endif
 #endif
 
+/* DW: bug in makefile seems to not want to define these, but they are needed! */
+/* Guillermo, maybe you can look at it */
+#ifdef FOR_MSW
+#  define FUNC(f, t, p) extern t f p
+#  define LFUNC(f, t, p) static t f p
+#endif
 
 /* Return ErrorStatus codes:
  * null     if full success
@@ -298,11 +304,8 @@ typedef struct {
 
 /* macros for forward declarations of functions with prototypes */
 #if NeedFunctionPrototypes
-#define FUNC(f, t, p) extern t f p
-#define LFUNC(f, t, p) static t f p
-#else
-#define FUNC(f, t, p) extern t f()
-#define LFUNC(f, t, p) static t f()
+#  define FUNC(f, t, p) extern t f p
+#  define LFUNC(f, t, p) static t f p
 #endif