[exim-cvs] Build: workaround inlining problems on Solaris

Gitweb: https://git.exim.org/exim.git/commitdiff/1a44d9d799eb1f94d87ae2cef4ca5b31720ccf88

Commit:     1a44d9d799eb1f94d87ae2cef4ca5b31720ccf88
Parent:     7b3d2d415f9bec9fc2689464d9e67ca2fc4c8666
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Jul 27 17:11:09 2019 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sat Jul 27 17:11:09 2019 +0100

    Build: workaround inlining problems on Solaris
---
 src/src/exim_dbmbuild.c | 9 +++++++++
 src/src/functions.h     | 2 ++
 src/src/mytypes.h       | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/src/exim_dbmbuild.c b/src/src/exim_dbmbuild.c
index 311d961..542f63c 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 bcf04c2..0602789 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 7d35fe0..a68dc28 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;