From 94effde9cace54a4b164001da229d59cc46c20ca Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Wed, 22 Jan 2020 11:27:34 +0000
Subject: [PATCH] Avoid Solaris compiler issue

---
 src/src/structs.h | 4 ++--
 test/runtest      | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/src/structs.h b/src/src/structs.h
index 631e0f263..aa394ac73 100644
--- a/src/src/structs.h
+++ b/src/src/structs.h
@@ -888,8 +888,8 @@ typedef struct namedlist_cacheblock {
 typedef struct namedlist_block {
   const uschar *string;			/* the list string */
   namedlist_cacheblock *cache_data;	/* cached domain_data or localpart_data */
-  int		number:31;		/* the number of the list for caching */
-  BOOL		hide:1;			/* -bP does not display value */
+  short		number;			/* the number of the list for caching */
+  BOOL		hide;			/* -bP does not display value */
 } namedlist_block;
 
 /* Structures for Access Control Lists */
diff --git a/test/runtest b/test/runtest
index c590ffc31..1b704b1ab 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1320,6 +1320,7 @@ RESET_AFTER_EXTRA_LINE_READ:
 
     # Platform differences in errno strings
     s/  SMTP\(Operation timed out\)<</  SMTP(Connection timed out)<</;
+    s/Arg list too long/Argument list too long/;
 
     # Platform differences for errno values (eg. Hurd)
     s/^errno = \d+$/errno = EEE/;
-- 
2.25.1