From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Mon, 19 Aug 2019 18:32:01 +0000 (+0100)
Subject: Build: workaround inlining problems on Solaris
X-Git-Tag: exim-4.93-RC0~93
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=8775d84f6a366680b392ed4e275071523695068a

Build: workaround inlining problems on Solaris
---

diff --git a/src/src/exim_dbmbuild.c b/src/src/exim_dbmbuild.c
index 327b46fd7..a78e49f18 100644
--- a/src/src/exim_dbmbuild.c
+++ b/src/src/exim_dbmbuild.c
@@ -47,6 +47,11 @@ gstring *
 string_vformat_trc(gstring * g, const uschar * func, unsigned line,
   unsigned size_limit, unsigned flags, const char *format, va_list ap)
 { return NULL; }
+uschar *
+string_sprintf_trc(const char *, const uschar *, unsigned , ...)
+{ return NULL; }
+BOOL split_spool_directory;
+uschar * queue_name;
 /******************************************************************************/
 
 
diff --git a/src/src/exim_dbutil.c b/src/src/exim_dbutil.c
index 7c34660cf..ff4a2efb5 100644
--- a/src/src/exim_dbutil.c
+++ b/src/src/exim_dbutil.c
@@ -50,9 +50,6 @@ gstring *
 string_vformat_trc(gstring * g, const uschar * func, unsigned line,
   unsigned size_limit, unsigned flags, const char *format, va_list ap)
 { return NULL; }
-extern uschar *string_sprintf_trc(const char *, const uschar *, unsigned , ...);
-extern BOOL split_spool_directory;
-extern uschar * queue_name;
 /******************************************************************************/
 
 
diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c
index 973b135f6..bbc75b680 100644
--- a/src/src/tls-gnu.c
+++ b/src/src/tls-gnu.c
@@ -1938,13 +1938,12 @@ uschar * dummy_errstr;
 rc = gnutls_server_name_get(session, sni_name, &data_len, &sni_type, 0);
 if (rc != GNUTLS_E_SUCCESS)
   {
-  DEBUG(D_tls) {
+  DEBUG(D_tls)
     if (rc == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
       debug_printf("TLS: no SNI presented in handshake.\n");
     else
       debug_printf("TLS failure: gnutls_server_name_get(): %s [%d]\n",
         gnutls_strerror(rc), rc);
-    }
   return 0;
   }