fix compilation bugs

diff --git a/ultrix/if_ppp.c b/ultrix/if_ppp.c
index ed4179814f24af9436f0bc733a26c64b368f6dff..d93f5d3e8c6c8f407d8795911cff812d9b4a21cf 100644 (file)
--- a/ultrix/if_ppp.c
+++ b/ultrix/if_ppp.c
@@ -72,7 +72,7 @@
  * Robert Olsson <robert@robur.slu.se> and Paul Mackerras.
  */
 
  * Robert Olsson <robert@robur.slu.se> and Paul Mackerras.
  */
 

-/* $Id: if_ppp.c,v 1.12 1996/09/26 06:18:37 paulus Exp $ */
+/* $Id: if_ppp.c,v 1.13 1997/03/04 03:45:17 paulus Exp $ */

 /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
 /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
 
 /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
 /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
 


@@ -120,6 +120,8 @@
 #include "ppp-comp.h"
 #endif
 
 #include "ppp-comp.h"
 #endif
 

+static int     pppsioctl(struct ifnet *, int, caddr_t);
+static int     pppoutput(struct ifnet *, struct mbuf *, struct sockaddr *);

 static void    ppp_requeue __P((struct ppp_softc *));
 static void    ppp_outpkt __P((struct ppp_softc *));
 static void    ppp_ccp __P((struct ppp_softc *, struct mbuf *m, int rcvd));
 static void    ppp_requeue __P((struct ppp_softc *));
 static void    ppp_outpkt __P((struct ppp_softc *));
 static void    ppp_ccp __P((struct ppp_softc *, struct mbuf *m, int rcvd));

diff --git a/ultrix/if_ppp.h b/ultrix/if_ppp.h
index 54dfa6d69c96e8a880b790c54d0a71bd7e1cd4a4..40b5d3e8fbe4616ae5aed938658a1cb0f6aa2ff3 100644 (file)
--- a/ultrix/if_ppp.h
+++ b/ultrix/if_ppp.h
@@ -1,4 +1,4 @@
-/*     $Id: if_ppp.h,v 1.2 1996/09/26 06:30:54 paulus Exp $    */
+/*     $Id: if_ppp.h,v 1.3 1997/03/04 03:45:17 paulus Exp $    */

 
 /*
  * if_ppp.h - Point-to-Point Protocol definitions.
 
 /*
  * if_ppp.h - Point-to-Point Protocol definitions.


@@ -129,8 +129,6 @@ struct ifpppcstatsreq {
 
 #if defined(_KERNEL) || defined(KERNEL)
 void pppattach(void);
 
 #if defined(_KERNEL) || defined(KERNEL)
 void pppattach(void);

-int pppsioctl(struct ifnet *, int, caddr_t);
-int pppoutput(struct ifnet *, struct mbuf *, struct sockaddr *);

 void pppintr();
 #endif
 #endif /* _IF_PPP_H_ */
 void pppintr();
 #endif
 #endif /* _IF_PPP_H_ */

diff --git a/ultrix/slcompress.c b/ultrix/slcompress.c
index 1cbdd3f79f7d5c052e523f55534abc2252a9f5cd..971bdeec756053eedb894f54c5bfb0fd50f43309 100644 (file)
--- a/ultrix/slcompress.c
+++ b/ultrix/slcompress.c
@@ -24,7 +24,7 @@
  * so that the entire packet being decompressed doesn't have
  * to be in contiguous memory (just the compressed header).
  *
  * so that the entire packet being decompressed doesn't have
  * to be in contiguous memory (just the compressed header).
  *

- * $Id: slcompress.c,v 1.3 1996/05/24 07:04:55 paulus Exp $
+ * $Id: slcompress.c,v 1.4 1997/03/04 03:45:18 paulus Exp $

  */
 
 #include "../h/types.h"
  */
 
 #include "../h/types.h"


@@ -416,7 +416,8 @@ sl_uncompress_tcp(bufp, len, type, comp)
        struct slcompress *comp;
 {
        u_char *hdr, *cp;
        struct slcompress *comp;
 {
        u_char *hdr, *cp;

-       int hlen, vjlen;
+       int vjlen;
+       u_int hlen;

 
        cp = bufp? *bufp: NULL;
        vjlen = sl_uncompress_tcp_core(cp, len, len, type, comp, &hdr, &hlen);
 
        cp = bufp? *bufp: NULL;
        vjlen = sl_uncompress_tcp_core(cp, len, len, type, comp, &hdr, &hlen);