Fixed compilation problems on SunOS 4.x

diff --git a/modules/ppp_ahdlc.c b/modules/ppp_ahdlc.c
index a55b173ad4f67a58633d1b4b234d82944ed1d183..3baaf54258fdda14dbd1e5245d1f17cd8b84bc33 100644 (file)
--- a/modules/ppp_ahdlc.c
+++ b/modules/ppp_ahdlc.c
@@ -41,7 +41,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *

- * $Id: ppp_ahdlc.c,v 1.12 2000/01/21 01:04:56 masputra Exp $
+ * $Id: ppp_ahdlc.c,v 1.13 2000/01/28 01:50:14 masputra Exp $

  */
 
 /*
  */
 
 /*


@@ -128,11 +128,15 @@ struct streamtab ppp_ahdlcinfo = {
     &winit,                        /* ptr to st_wrinit */
     NULL,                          /* ptr to st_muxrinit */
     NULL,                          /* ptr to st_muxwinit */
     &winit,                        /* ptr to st_wrinit */
     NULL,                          /* ptr to st_muxrinit */
     NULL,                          /* ptr to st_muxwinit */

-#ifdef _SunOS4
+#if defined(SUNOS4)

     NULL                           /* ptr to ptr to st_modlist */
     NULL                           /* ptr to ptr to st_modlist */

-#endif /* _SunOS4 */
+#endif /* SUNOS4 */

 };
 
 };
 

+#if defined(SUNOS4)
+int ppp_ahdlc_count = 0;           /* open counter */
+#endif /* SUNOS4 */
+

 /*
  * Per-stream state structure
  */
 /*
  * Per-stream state structure
  */


@@ -256,6 +260,10 @@ MOD_OPEN(ahdlc_open)
     mutex_exit(&state->lock);
 #endif /* USE_MUTEX */ 
 
     mutex_exit(&state->lock);
 #endif /* USE_MUTEX */ 
 

+#if defined(SUNOS4)
+    ppp_ahdlc_count++;
+#endif /* SUNOS4 */
+

     qprocson(q);
     
     return 0;
     qprocson(q);
     
     return 0;


@@ -294,6 +302,11 @@ MOD_CLOSE(ahdlc_close)
     FREE(q->q_ptr, sizeof(ahdlc_state_t));
     q->q_ptr        = NULL;
     OTHERQ(q)->q_ptr = NULL;
     FREE(q->q_ptr, sizeof(ahdlc_state_t));
     q->q_ptr        = NULL;
     OTHERQ(q)->q_ptr = NULL;

+
+#if defined(SUNOS4)
+    if (ppp_ahdlc_count)
+       ppp_ahdlc_count--;
+#endif /* SUNOS4 */

     
     return 0;
 }
     
     return 0;
 }


@@ -675,6 +688,15 @@ ahdlc_encode(q, mp)
 #define IN_RX_MAP(c, m)        ((((unsigned int) (uchar_t) (c)) < 0x20) && \
                        (m) & (1 << (c)))
 
 #define IN_RX_MAP(c, m)        ((((unsigned int) (uchar_t) (c)) < 0x20) && \
                        (m) & (1 << (c)))
 

+/*
+ * SunOS 4.x does not have intptr_t or uintptr_t defined, so
+ * declare them here
+ */
+#if defined(SUNOS4)
+typedef        int                     intptr_t;
+typedef        unsigned int            uintptr_t;
+#endif /* SUNOS4 */
+

 /*
  * Process received characters.
  */
 /*
  * Process received characters.
  */


@@ -684,10 +706,14 @@ ahdlc_decode(q, mp)
     mblk_t  *mp;
 {
     ahdlc_state_t   *state;
     mblk_t  *mp;
 {
     ahdlc_state_t   *state;

-    mblk_t         *om, *zmp;
+    mblk_t         *om;

     uchar_t        *dp;
     ushort_t       fcs;
     uchar_t        *dp;
     ushort_t       fcs;

+#if defined(SOL2)
+    mblk_t         *zmp;
+#endif /* SOL2 */

 
 

+#if defined(SOL2)

     /*
      * In case the driver (or something below) doesn't send
      * data upstream in one message block, concatenate everything
     /*
      * In case the driver (or something below) doesn't send
      * data upstream in one message block, concatenate everything


@@ -701,6 +727,7 @@ ahdlc_decode(q, mp)
        if (mp == 0)
            return; 
     }
        if (mp == 0)
            return; 
     }

+#endif /* SOL2 */

 
     state = (ahdlc_state_t *) q->q_ptr;
 
 
     state = (ahdlc_state_t *) q->q_ptr;