look for __sym__ as well as sym

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

diff --git a/modules/bsd-comp.c b/modules/bsd-comp.c
index c342d98c64d427932ed15f34d85578bde1ebb650..58b067f4606c95c31f5a1f3737b5c6cc24500e93 100644 (file)
--- a/modules/bsd-comp.c
+++ b/modules/bsd-comp.c
@@ -39,12 +39,12 @@
 
 /*
  * This version is for use with STREAMS under SunOS 4.x,
 
 /*
  * 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.9 1995/04/28 06:13:56 paulus Exp $
+ * $Id: bsd-comp.c,v 1.16 1995/10/27 03:35:49 paulus Exp $

  */
 
  */
 

-#ifdef __aix4__
+#if defined(aix4) || defined(__aix4__)

 #include <net/net_globals.h>
 #endif
 #include <sys/param.h>
 #include <net/net_globals.h>
 #endif
 #include <sys/param.h>


@@ -55,19 +55,33 @@
 #include <net/ppp_defs.h>
 #include <net/ppp_str.h>
 
 #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))
+#if defined(svr4) || defined(__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 */
+# if defined(sun) || defined(__sun__)
+#  include <sys/kmem_alloc.h>
+#  define ALLOCATE(n)  kmem_alloc((n), KMEM_NOSLEEP)
+#  define FREE(p, n)   kmem_free((p), (n))
+# endif

 #endif
 
 #endif
 

-#ifdef __osf__
+#if defined(osf) || defined(__osf__)

 #include <kern/kalloc.h>
 #include <kern/kalloc.h>

+#ifdef FIRST
+#undef FIRST
+#undef LAST
+#endif
+#ifdef FREE
+#undef FREE
+#endif

 #define ALLOCATE(n)    kalloc((n))
 #define FREE(p, n)     kfree((p), (n))
 #define ALLOCATE(n)    kalloc((n))
 #define FREE(p, n)     kfree((p), (n))

+#define BSD_LITTLE_ENDIAN

 #endif
 
 #endif
 

-#ifdef __aix4__
+#if defined(aix4) || defined(__aix4__)

 #define ALLOCATE(n)    xmalloc((n), 0, pinned_heap)
 #define FREE(p, n)     xmfree((p), pinned_heap)
 #endif
 #define ALLOCATE(n)    xmalloc((n), 0, pinned_heap)
 #define FREE(p, n)     xmfree((p), pinned_heap)
 #endif


@@ -75,6 +89,8 @@
 #define PACKETPTR      mblk_t *
 #include <net/ppp-comp.h>
 
 #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
 /*
  * PPP "BSD compress" compression
  *  The differences between this compression and the classic BSD LZW


@@ -146,7 +162,7 @@ struct bsd_db {
 };
 
 #define BSD_OVHD       2               /* BSD compress overhead/packet */
 };
 
 #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));
 
 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 +1125,4 @@ bsd_decompress(state, cmsg, dmpp)
     *dmpp = mret;
     return DECOMP_OK;
 }
     *dmpp = mret;
     return DECOMP_OK;
 }

+#endif /* DO_BSD_COMPRESS */