mods for SVR4 (incl. Solaris 2) and for OSF/1

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

diff --git a/modules/bsd-comp.c b/modules/bsd-comp.c
index 6bdbe10cfb28a687aa73ae88f7994c2a2eb52820..7ae89fde2f41d817a7eebefbbdce77964ca1e87d 100644 (file)
--- a/modules/bsd-comp.c
+++ b/modules/bsd-comp.c
@@ -39,9 +39,9 @@
 
 /*
  * This version is for use with STREAMS under SunOS 4.x,
- * DEC Alpha OSF/1, and AIX 4.x.
+ * DEC Alpha OSF/1, AIX 4.x, and SVR4 systems including Solaris 2.
  *
- * $Id: bsd-comp.c,v 1.10 1995/05/01 01:43:16 paulus Exp $
+ * $Id: bsd-comp.c,v 1.13 1995/05/29 06:34:33 paulus Exp $
  */
 
 #ifdef __aix4__
@@ -55,13 +55,26 @@
 #include <net/ppp_defs.h>
 #include <net/ppp_str.h>
 
-#ifdef sun
-#include <sys/kmem_alloc.h>
-#define ALLOCATE(n)    kmem_alloc((n), KMEM_NOSLEEP)
-#define FREE(p, n)     kmem_free((p), (n))
+#ifdef __svr4__                        /* SVR4, including SunOS 5.x */
+# include <sys/kmem.h>
+# define ALLOCATE(n)   kmem_alloc((n), KM_NOSLEEP)
+# define FREE(p, n)    kmem_free((p), (n))
+#else                          /* SunOS 4.x */
+# ifdef sun
+#  include <sys/kmem_alloc.h>
+#  define ALLOCATE(n)  kmem_alloc((n), KMEM_NOSLEEP)
+#  define FREE(p, n)   kmem_free((p), (n))
+# endif
 #endif
 
 #ifdef __osf__
+#ifdef FIRST
+#undef FIRST
+#undef LAST
+#endif
+#ifdef FREE
+#undef FREE
+#endif
 #include <kern/kalloc.h>
 #define ALLOCATE(n)    kalloc((n))
 #define FREE(p, n)     kfree((p), (n))
@@ -148,7 +161,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));