Added np mode stuff to support demand-dialling

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

diff --git a/modules/bsd-comp.c b/modules/bsd-comp.c
index b37d363505b61d8075213b15f1489924866e9a56..a9cf15be8f4a56faf9d4683e509c394c03d7fcf7 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.11 1995/05/02 02:49:09 paulus Exp $
+ * $Id: bsd-comp.c,v 1.17 1995/12/11 02:57:48 paulus Exp $

  */
 
  */
 

-#ifdef __aix4__
+#ifdef AIX4

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


@@ -54,22 +54,19 @@
 #include <net/if.h>
 #include <net/ppp_defs.h>
 #include <net/ppp_str.h>
 #include <net/if.h>
 #include <net/ppp_defs.h>
 #include <net/ppp_str.h>

+#include "ppp_mod.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
+#include <sys/byteorder.h>
+#ifndef _BIG_ENDIAN
+#define BSD_LITTLE_ENDIAN

 #endif
 #endif

-
-#ifdef __osf__
-#include <kern/kalloc.h>
-#define ALLOCATE(n)    kalloc((n))
-#define FREE(p, n)     kfree((p), (n))

 #endif
 
 #endif
 

-#ifdef __aix4__
-#define ALLOCATE(n)    xmalloc((n), 0, pinned_heap)
-#define FREE(p, n)     xmfree((p), pinned_heap)
+#ifdef OSF1
+#undef FIRST
+#undef LAST
+#define BSD_LITTLE_ENDIAN

 #endif
 
 #define PACKETPTR      mblk_t *
 #endif
 
 #define PACKETPTR      mblk_t *


@@ -363,7 +360,7 @@ bsd_alloc(options, opt_len, decomp)
 
     maxmaxcode = MAXCODE(bits);
     newlen = sizeof(*db) + (hsize-1) * (sizeof(db->dict[0]));
 
     maxmaxcode = MAXCODE(bits);
     newlen = sizeof(*db) + (hsize-1) * (sizeof(db->dict[0]));

-    db = (struct bsd_db *) ALLOCATE(newlen);
+    db = (struct bsd_db *) ALLOC_NOSLEEP(newlen);

     if (!db)
        return NULL;
     bzero(db, sizeof(*db) - sizeof(db->dict));
     if (!db)
        return NULL;
     bzero(db, sizeof(*db) - sizeof(db->dict));


@@ -371,7 +368,7 @@ bsd_alloc(options, opt_len, decomp)
     if (!decomp) {
        db->lens = NULL;
     } else {
     if (!decomp) {
        db->lens = NULL;
     } else {

-       db->lens = (u_short *) ALLOCATE((maxmaxcode+1) * sizeof(db->lens[0]));
+       db->lens = (u_short *) ALLOC_NOSLEEP((maxmaxcode+1) * sizeof(db->lens[0]));

        if (!db->lens) {
            FREE(db, newlen);
            return NULL;
        if (!db->lens) {
            FREE(db, newlen);
            return NULL;