get around FreeBSD already having an inflate()

diff --git a/common/zlib.c b/common/zlib.c
index e9dc1770c94f667b7001b861d4aa3e416ab979b9..63902209d7f16f6467da52a79a1e7c21f2634053 100644 (file)
--- a/common/zlib.c
+++ b/common/zlib.c
@@ -11,7 +11,7 @@
  * - added Z_PACKET_FLUSH (see zlib.h for details)
  * - added inflateIncomp
  *
- * $Id: zlib.c,v 1.4 1996/10/08 04:38:00 paulus Exp $
+ * $Id: zlib.c,v 1.5 1997/03/04 03:26:35 paulus Exp $
  */
 
 /* 
@@ -89,14 +89,11 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
 
 #if defined(KERNEL) || defined(_KERNEL)
 #include <sys/types.h>
+#include <sys/time.h>
 #include <sys/systm.h>
 #  define zmemcpy(d, s, n)     bcopy((s), (d), (n))
 #  define zmemzero             bzero
 
-#ifdef FreeBSD
-#define inflate        inflate_ppp
-#endif
-
 #else
 #if defined(__KERNEL__)
 /* Assume this is Linux */

diff --git a/common/zlib.h b/common/zlib.h
index 9ce824fd8fcc19db12def2375b6e282669005b3a..36cb5150e988b97aebe91d0408a1e1c1579c0bfc 100644 (file)
--- a/common/zlib.h
+++ b/common/zlib.h
@@ -1,4 +1,4 @@
-/*     $Id: zlib.h,v 1.3 1996/09/26 06:29:53 paulus Exp $      */
+/*     $Id: zlib.h,v 1.4 1997/03/04 03:26:36 paulus Exp $      */
 
 /*
  * This file is derived from zlib.h and zconf.h from the zlib-0.95
@@ -377,6 +377,10 @@ extern int inflateInit OF((z_stream *strm));
 */
 
 
+#if defined(__FreeBSD__) && (defined(KERNEL) || defined(_KERNEL))
+#define inflate        inflate_ppp     /* FreeBSD already has an inflate :-( */
+#endif
+
 extern int inflate OF((z_stream *strm, int flush));
 /*
   Performs one or both of the following actions: