From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 16 Sep 2017 17:05:57 +0000 (+0100)
Subject: Fix build on FreeBSD
X-Git-Tag: exim-4_90_RC1~67
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0d68983b8b7c2040e81090f1d5aa8d2c4043eab3;p=exim.git

Fix build on FreeBSD
---

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index 96b19cbad..a6cb2f80d 100644
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -139,89 +139,89 @@ OBJ_MACRO = macro_predef.o \
 $(OBJ_MACRO):	$(MACRO_HSRC)
 
 macro_predef.o :	macro_predef.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF macro_predef.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ macro_predef.c
 macro-globals.o :	globals.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF globals.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ globals.c
 macro-readconf.o :	readconf.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF readconf.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ readconf.c
 macro-route.o :		route.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF route.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ route.c
 macro-transport.o:	transport.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF transport.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ transport.c
 macro-drtables.o :	drtables.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF drtables.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ drtables.c
 macro-appendfile.o :	transports/appendfile.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF transports/appendfile.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ transports/appendfile.c
 macro-autoreply.o :	transports/autoreply.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF transports/autoreply.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ transports/autoreply.c
 macro-lmtp.o:		transports/lmtp.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF transports/lmtp.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ transports/lmtp.c
 macro-pipe.o :		transports/pipe.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF transports/pipe.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ transports/pipe.c
 macro-queuefile.o :	transports/queuefile.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF transports/queuefile.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ transports/queuefile.c
 macro-smtp.o :		transports/smtp.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF transports/smtp.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ transports/smtp.c
 macro-accept.o :	routers/accept.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF routers/accept.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ routers/accept.c
 macro-dnslookup.o :	routers/dnslookup.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF routers/dnslookup.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ routers/dnslookup.c
 macro-ipliteral.o :	routers/ipliteral.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF routers/ipliteral.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ routers/ipliteral.c
 macro-iplookup.o :	routers/iplookup.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF routers/iplookup.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ routers/iplookup.c
 macro-manualroute.o :	routers/manualroute.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF routers/manualroute.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ routers/manualroute.c
 macro-queryprogram.o :	routers/queryprogram.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF routers/queryprogram.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ routers/queryprogram.c
 macro-redirect.o :	routers/redirect.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF routers/redirect.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ routers/redirect.c
 macro-auth-spa.o :	auths/auth-spa.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF auths/auth-spa.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/auth-spa.c
 macro-cram_md5.o :	auths/cram_md5.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF auths/cram_md5.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/cram_md5.c
 macro-cyrus_sasl.o :	auths/cyrus_sasl.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF auths/cyrus_sasl.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/cyrus_sasl.c
 macro-dovecot.o:	auths/dovecot.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF auths/dovecot.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/dovecot.c
 macro-gsasl_exim.o :	auths/gsasl_exim.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF auths/gsasl_exim.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/gsasl_exim.c
 macro-heimdal_gssapi.o:	auths/heimdal_gssapi.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF auths/heimdal_gssapi.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/heimdal_gssapi.c
 macro-plaintext.o :	auths/plaintext.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF auths/plaintext.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/plaintext.c
 macro-spa.o :		auths/spa.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF auths/spa.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/spa.c
 macro-tls.o:		auths/tls.c
-	@echo "$(CC) -DMACRO_PREDEF $<"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ $<
+	@echo "$(CC) -DMACRO_PREDEF auths/tls.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/tls.c
 
 macro_predef: $(OBJ_MACRO)
 	@echo "$(LNCC) -o $<"
diff --git a/src/src/deliver.c b/src/src/deliver.c
index c91f26e81..73921980e 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -3326,7 +3326,7 @@ while (!done)
   ssize_t got;
 
   DEBUG(D_deliver) debug_printf(
-    "expect %lu bytes (pipeheader) from tpt process %d\n", (ulong)required, pid);
+    "expect %lu bytes (pipeheader) from tpt process %d\n", (u_long)required, pid);
 
   /* We require(!) all the PIPE_HEADER_SIZE bytes here, as we know,
   they're written in a timely manner, so waiting for the write shouldn't hurt a lot.
@@ -3365,7 +3365,7 @@ while (!done)
 
   DEBUG(D_deliver)
     debug_printf("expect %lu bytes (pipedata) from transport process %d\n",
-      (ulong)required, pid);
+      (u_long)required, pid);
 
   /* Same as above, the transport process will write the bytes announced
   in a timely manner, so we can just wait for the bytes, getting less than expected