update to 2.3.1

[ppp.git] / common / zlib.h

diff --git a/common/zlib.h b/common/zlib.h
index 9ce824fd8fcc19db12def2375b6e282669005b3a..864698a8e8b0c656ca0992028bfbe44b126abd28 100644 (file)
--- 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.6 1997/05/22 06:44:40 paulus Exp $      */
 
 /*
  * This file is derived from zlib.h and zconf.h from the zlib-0.95
@@ -8,7 +8,7 @@
  */
 
 /*
- *  ==FILEVERSION 960122==
+ *  ==FILEVERSION 970501==
  *
  * This marker is used by the Linux installation script to determine
  * whether an up-to-date version of this file is already installed.
@@ -176,6 +176,7 @@ typedef struct z_stream_s {
     struct internal_state FAR *state; /* not visible by applications */
 
     alloc_func zalloc;  /* used to allocate the internal state */
+    alloc_func zalloc_init;  /* used to allocate the internal state during initialization */
     free_func  zfree;   /* used to free the internal state */
     voidp      opaque;  /* private data object passed to zalloc and zfree */
 
@@ -377,6 +378,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: