If MALLOCDEBUG, include the lib's setup.h here so that the proper defines

are set before all system headers, as otherwise we get compiler warnings
on my Solaris at least.

diff --git a/src/setup.h b/src/setup.h
index d85f85a..65eef4b 100644 (file)
--- a/src/setup.h
+++ b/src/setup.h
@@ -23,8 +23,6 @@
  * $Id$
  ***************************************************************************/
 
-#include <stdio.h>
-
 #if !defined(WIN32) && defined(__WIN32__)
 /* Borland fix */
 #define WIN32
@@ -50,6 +48,15 @@
 #endif
 #endif
 
+#ifdef MALLOCDEBUG
+/* This is an ugly hack for MALLOCDEBUG conditions only. We need to include
+   the file here, since it might set the _FILE_OFFSET_BITS define, which must
+   be set BEFORE all normal system headers. */
+#include "../lib/setup.h"
+#endif
+
+#include <stdio.h>
+
 #ifndef OS
 #define OS "unknown"
 #endif