tidying

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index 7746597ba0ff072f387b72f42a3e7762f16453fe..aa3b371a8157520e4027f3986c08130588d621d5 100644 (file)
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -128,7 +128,7 @@ MACRO_HSRC = macro_predef.h os.h globals.h config.h \
 
 macro_predef: $(MACRO_CSRC) $(MACRO_HSRC)
        @echo "$(CC) -DMACRO_PREDEF macro_predef.c"
-       $(FE)$(CC) $(CFLAGS) -DMACRO_PREDEF -o macro_predef $(MACRO_CSRC)
+       $(FE)$(CC) $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o macro_predef $(MACRO_CSRC)
 
 macro.c: macro_predef
        ./macro_predef > macro.c

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 19342358a35288083cb01944044a08e555e5fbd0..5aebfd4fe8669641d967438ea1a4cd690c7a771a 100644 (file)
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -2577,7 +2577,7 @@ static uschar * corked = NULL;
 static int c_size = 0, c_len = 0;
 
 DEBUG(D_tls) debug_printf("%s(%p, %lu%s)\n", __FUNCTION__,
-  buff, (ulong)len, more ? ", more" : "");
+  buff, (unsigned long)len, more ? ", more" : "");
 
 /* Lacking a CORK or MSG_MORE facility (such as GnuTLS has) we copy data when
 "more" is notified.  This hack is only ok if small amounts are involved AND only