From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 10 Oct 2021 10:36:56 +0000 (+0100)
Subject: tidying
X-Git-Tag: exim-4.96-RC0~158
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/fe3493048f20a2ea5f9838e51e1b1dd8c188a90d

tidying
---

diff --git a/src/OS/os.h-FreeBSD b/src/OS/os.h-FreeBSD
index 9220c31f7..36a6d7115 100644
--- a/src/OS/os.h-FreeBSD
+++ b/src/OS/os.h-FreeBSD
@@ -58,6 +58,11 @@ performance on outgoing mail a bit. */
 #define OS_SENDFILE
 extern ssize_t os_sendfile(int, int, off_t *, size_t);
 
+#ifdef PID_T_FMT
+# undef PID_T_FMT
+#endif
+#define PID_T_FMT "%d"
+
 
 /*******************/
 
diff --git a/src/src/exim.c b/src/src/exim.c
index 833045018..6e97981b0 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -122,7 +122,7 @@ if (!(yield = pcre2_compile((PCRE2_SPTR)pattern, PCRE2_ZERO_TERMINATED, options,
   uschar errbuf[128];
   pcre2_get_error_message(err, errbuf, sizeof(errbuf));
   log_write(0, LOG_MAIN|LOG_PANIC_DIE, "regular expression error: "
-    "%s at offset %d while compiling %s", errbuf, (long)offset, pattern);
+    "%s at offset %ld while compiling %s", errbuf, (long)offset, pattern);
   }
 
 if (use_malloc)
diff --git a/src/src/expand.c b/src/src/expand.c
index 3d48301a1..41016c316 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -2982,7 +2982,7 @@ switch(cond_type = identify_operator(&s, &opname))
 	uschar errbuf[128];
 	pcre2_get_error_message(err, errbuf, sizeof(errbuf));
 	expand_string_message = string_sprintf("regular expression error in "
-	  "\"%s\": %s at offset %d", sub[1], errbuf, offset);
+	  "\"%s\": %s at offset %ld", sub[1], errbuf, (long)offset);
 	return NULL;
 	}