Index: src/crossroads.h
--- src/crossroads.h.orig	2008-01-26 01:24:46 +0100
+++ src/crossroads.h	2008-01-26 10:23:23 +0100
@@ -14,9 +14,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
-#if HAVE_MALLOC_H == 1
-#include <malloc.h>
-#endif
 #include <math.h>
 #include <pwd.h>
 #include <signal.h>
Index: src/lib/thruputlog.c
--- src/lib/thruputlog.c.orig	2008-01-26 01:24:46 +0100
+++ src/lib/thruputlog.c	2008-01-26 10:29:27 +0100
@@ -41,7 +41,7 @@
     
     /* Report the activity. */
     fprintf (f, "%7.7d %15f %c %8d ",
-	     getpid(),
+	     (int)getpid(),
 	     d_now - d_start,
 	     dir == dir_client_to_server ? 'C' : 'B',
 	     len);