diff options
| author | Paul Mackerras <paulus@samba.org> | 1997-03-04 03:26:36 +0000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 1997-03-04 03:26:36 +0000 |
| commit | 3c2d3892cb4bf5609fae25df7e4d8a1a3a90922f (patch) | |
| tree | 81ae6ea11b30c80d35ba6df74704e5e3e8271384 /common | |
| parent | c13be9b363e55de0c4989d713682be647184443f (diff) | |
| download | ppp-3c2d3892cb4bf5609fae25df7e4d8a1a3a90922f.tar.gz | |
get around FreeBSD already having an inflate()
Diffstat (limited to 'common')
| -rw-r--r-- | common/zlib.c | 7 | ||||
| -rw-r--r-- | common/zlib.h | 6 |
2 files changed, 7 insertions, 6 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 */ diff --git a/common/zlib.h b/common/zlib.h index 9ce824f..36cb515 100644 --- 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: |