From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 27 Jul 2019 16:11:09 +0000 (+0100)
Subject: Build: workaround inlining problems on Solaris
X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/1a44d9d799eb1f94d87ae2cef4ca5b31720ccf88?hp=7b3d2d415f9bec9fc2689464d9e67ca2fc4c8666

Build: workaround inlining problems on Solaris
---

diff --git a/src/src/exim_dbmbuild.c b/src/src/exim_dbmbuild.c
index 311d961e8..542f63cbb 100644
--- a/src/src/exim_dbmbuild.c
+++ b/src/src/exim_dbmbuild.c
@@ -32,6 +32,7 @@ characters. */
 
 uschar * spool_directory = NULL;	/* dummy for dbstuff.h */
 
+/******************************************************************************/
 					/* dummies needed by Solaris build */
 void *
 store_get_3(int size, BOOL tainted, const char *filename, int linenumber)
@@ -39,6 +40,14 @@ store_get_3(int size, BOOL tainted, const char *filename, int linenumber)
 void **
 store_reset_3(void **ptr, int pool, const char *filename, int linenumber)
 { }
+void
+store_release_above_3(void *ptr, const char *func, int linenumber)
+{ }
+gstring *
+string_vformat_trc(gstring * g, const uschar * func, unsigned line,
+  unsigned size_limit, unsigned flags, const char *format, va_list ap)
+{ }
+/******************************************************************************/
 
 
 #define max_insize   20000
diff --git a/src/src/functions.h b/src/src/functions.h
index bcf04c2d2..060278959 100644
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -737,6 +737,7 @@ return ss;
 }
 
 
+# ifndef COMPILE_UTILITY
 /*************************************************
 *     Copy and save string in longterm store     *
 *************************************************/
@@ -760,6 +761,7 @@ memcpy(ss, s, len);
 store_pool = old_pool;
 return ss;
 }
+# endif
 
 
 
diff --git a/src/src/mytypes.h b/src/src/mytypes.h
index 7d35fe0d8..a68dc2817 100644
--- a/src/src/mytypes.h
+++ b/src/src/mytypes.h
@@ -134,7 +134,7 @@ By extension, a variable pointing to this address is tainted.
 static inline BOOL
 is_tainted(const void * p)
 {
-#ifdef MACRO_PREDEF
+#if defined(COMPILE_UTILITY) || defined(MACRO_PREDEF)
 return FALSE;
 #else
 extern void * tainted_base, * tainted_top;