Fix build with Solaris compiler

Broken-by: 3cee6033bae8

diff --git a/src/src/exim.h b/src/src/exim.h
index 9bf5dcdfc1b46e242927193977916517f65bc991..c4d80c694602046d69e633fef261a2503c2a9628 100644 (file)
--- a/src/src/exim.h
+++ b/src/src/exim.h
@@ -525,14 +525,18 @@ config.h, mytypes.h, and store.h, so we don't need to mention them explicitly.
 #include "path_max.h"
 #include "macros.h"
 #include "blob.h"
-#include "hintsdb.h"
+#ifndef MACRO_PREDEF
+# include "hintsdb.h"
+#endif
 #include "hintsdb_structs.h"
 #include "structs.h"
 #include "blob.h"
 #include "hash.h"
 #include "globals.h"
 #include "functions.h"
-#include "dbfunctions.h"
+#ifndef MACRO_PREDEF
+# include "dbfunctions.h"
+#endif
 #include "osfunctions.h"
 
 #ifdef EXPERIMENTAL_BRIGHTMAIL

diff --git a/src/src/hintsdb/hints_bdb.h b/src/src/hintsdb/hints_bdb.h
index 48573e9072c76ab2d9f44fd4e652d24585a5532f..99878a2d6b942f57a059d70285a07b374e7db6db 100644 (file)
--- a/src/src/hintsdb/hints_bdb.h
+++ b/src/src/hintsdb/hints_bdb.h
@@ -72,9 +72,7 @@ at DB release 4.3. */
 static inline void
 dbfn_bdb_error_callback(const DB_ENV * dbenv, const char * pfx, const char * msg)
 {
-#ifndef MACRO_PREDEF 
 log_write(0, LOG_MAIN, "Berkeley DB error: %s", msg);
-#endif
 }