mods for SunOS 5.x

[ppp.git] / modules / bsd-comp.c

diff --git a/modules/bsd-comp.c b/modules/bsd-comp.c
index c342d98c64d427932ed15f34d85578bde1ebb650..48bde3125d84dbdd6ace6819b4afd530b9e0e310 100644 (file)
--- a/modules/bsd-comp.c
+++ b/modules/bsd-comp.c
@@ -41,7 +41,7 @@
  * This version is for use with STREAMS under SunOS 4.x,
  * DEC Alpha OSF/1, and AIX 4.x.
  *
- * $Id: bsd-comp.c,v 1.9 1995/04/28 06:13:56 paulus Exp $
+ * $Id: bsd-comp.c,v 1.12 1995/05/19 03:48:34 paulus Exp $
  */
 
 #ifdef __aix4__
@@ -56,8 +56,13 @@
 #include <net/ppp_str.h>
 
 #ifdef sun
+#ifdef __svr4__                        /* SunOS 5.x */
+#include <sys/kmem.h>
+#define ALLOCATE(n)    kmem_alloc((n), KM_NOSLEEP)
+#else                          /* SunOS 4.x */
 #include <sys/kmem_alloc.h>
 #define ALLOCATE(n)    kmem_alloc((n), KMEM_NOSLEEP)
+#endif
 #define FREE(p, n)     kmem_free((p), (n))
 #endif
 
@@ -75,6 +80,8 @@
 #define PACKETPTR      mblk_t *
 #include <net/ppp-comp.h>
 
+#if DO_BSD_COMPRESS
+
 /*
  * PPP "BSD compress" compression
  *  The differences between this compression and the classic BSD LZW
@@ -146,7 +153,7 @@ struct bsd_db {
 };
 
 #define BSD_OVHD       2               /* BSD compress overhead/packet */
-#define BSD_INIT_BITS  MIN_BSD_BITS
+#define BSD_INIT_BITS  BSD_MIN_BITS
 
 static void    *bsd_comp_alloc __P((u_char *options, int opt_len));
 static void    *bsd_decomp_alloc __P((u_char *options, int opt_len));
@@ -1109,3 +1116,4 @@ bsd_decompress(state, cmsg, dmpp)
     *dmpp = mret;
     return DECOMP_OK;
 }
+#endif /* DO_BSD_COMPRESS */