* - 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 $
*/
/*
#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 */
-/* $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
*/
+#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: