include netbsd-1.2

[ppp.git] / common / zlib.h

diff --git a/common/zlib.h b/common/zlib.h
index 5896d9015e3db8cdbce49929a49538ca63084303..36cb5150e988b97aebe91d0408a1e1c1579c0bfc 100644 (file)
--- a/common/zlib.h
+++ b/common/zlib.h
@@ -1,4 +1,4 @@
-/*     $Id: zlib.h,v 1.2 1996/04/04 02:43:58 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
@@ -7,6 +7,13 @@
  * decompression for PPP packets.
  */
 
+/*
+ *  ==FILEVERSION 960122==
+ *
+ * This marker is used by the Linux installation script to determine
+ * whether an up-to-date version of this file is already installed.
+ */
+
 /* zlib.h -- interface of the 'zlib' general purpose compression library
   version 0.95, Aug 16th, 1995.
 
@@ -370,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: