summaryrefslogtreecommitdiff
path: root/common/zlib.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>1997-03-04 03:26:36 +0000
committerPaul Mackerras <paulus@samba.org>1997-03-04 03:26:36 +0000
commit3c2d3892cb4bf5609fae25df7e4d8a1a3a90922f (patch)
tree81ae6ea11b30c80d35ba6df74704e5e3e8271384 /common/zlib.c
parentc13be9b363e55de0c4989d713682be647184443f (diff)
downloadppp-3c2d3892cb4bf5609fae25df7e4d8a1a3a90922f.tar.gz
get around FreeBSD already having an inflate()
Diffstat (limited to 'common/zlib.c')
-rw-r--r--common/zlib.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/common/zlib.c b/common/zlib.c
index e9dc177..6390220 100644
--- 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 */