4 files changed, 9 insertions, 7 deletions
diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc
index f703621c8..dae6f0528 100644
--- a/apt-pkg/contrib/cdromutl.cc
+++ b/apt-pkg/contrib/cdromutl.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: cdromutl.cc,v 1.10 1999/12/10 06:30:42 jgg Exp $
+// $Id: cdromutl.cc,v 1.11 1999/12/10 23:40:29 jgg Exp $
 /* ######################################################################
    
    CDROM Utilities - Some functions to manipulate CDROM mounts.
@@ -170,7 +170,7 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version)
 	 struct stat Buf;
 	 if (stat(Dir->d_name,&Buf) != 0)
 	    continue;
-	 sprintf(S,"%lu",Buf.st_mtime);
+	 sprintf(S,"%lu",(unsigned long)Buf.st_mtime);
       }
       
       Hash.Add(S);
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 59d6aa50a..7cd948265 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: fileutl.cc,v 1.32 1999/12/09 21:18:01 jgg Exp $
+// $Id: fileutl.cc,v 1.33 1999/12/10 23:40:29 jgg Exp $
 /* ######################################################################
    
    File Utilities
@@ -25,8 +25,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/time.h>
+#include <sys/wait.h>
 #include <signal.h>
-#include <wait.h>
 #include <errno.h>
 									/*}}}*/
 
diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index 11fe07e51..1e2ab3656 100644
--- a/apt-pkg/contrib/md5.cc
+++ b/apt-pkg/contrib/md5.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: md5.cc,v 1.10 1999/11/16 03:10:56 jgg Exp $
+// $Id: md5.cc,v 1.11 1999/12/10 23:40:29 jgg Exp $
 /* ######################################################################
    
    MD5Sum - MD5 Message Digest Algorithm.
@@ -43,11 +43,11 @@
 #include <apt-pkg/strutl.h>
 
 #include <string.h>
-#include <system.h>
 #include <unistd.h>
 #include <netinet/in.h>                          // For htonl
 #include <inttypes.h>
 #include <config.h>
+#include <system.h>
 									/*}}}*/
 
 // byteSwap - Swap bytes in a buffer					/*{{{*/
diff --git a/apt-pkg/contrib/system.h b/apt-pkg/contrib/system.h
index 325576dbf..7ec3d7feb 100644
--- a/apt-pkg/contrib/system.h
+++ b/apt-pkg/contrib/system.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: system.h,v 1.2 1999/01/18 06:20:08 jgg Exp $
+// $Id: system.h,v 1.3 1999/12/10 23:40:29 jgg Exp $
 /* ######################################################################
    
    System Header - Usefull private definitions
@@ -19,6 +19,7 @@
 #define	MAX_VAL(t)	(((t)(-1) > 0) ? (t)(-1) : (t)(((1L<<(sizeof(t)*8-1))-1)))
 
 // Min/Max functions
+#if !defined(MIN)
 #if defined(__HIGHC__)
 #define MIN(x,y) _min(x,y)
 #define MAX(x,y) _max(x,y)
@@ -36,6 +37,7 @@
 #define MIN(A,B) ((A) < (B)?(A):(B))
 #define MAX(A,B) ((A) > (B)?(A):(B))
 #endif
+#endif
 
 /* Bound functions, bound will return the value b within the limits a-c
    bounv will change b so that it is within the limits of a-c. */