X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=common%2Fzlib.h;h=36cb5150e988b97aebe91d0408a1e1c1579c0bfc;hp=9ce824fd8fcc19db12def2375b6e282669005b3a;hb=2e5bd580090480746b8193eb83f2cec41552d28f;hpb=5b7f8c26cdb0ae73278f68cbd47bcb225bfd5803

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: