From: Paul Mackerras Date: Tue, 4 Mar 1997 03:45:18 +0000 (+0000) Subject: fix compilation bugs X-Git-Tag: RELEASE_2_3_6~238 X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=afc91a00dd17734d3076c083b18f2535b96d2133;ds=sidebyside fix compilation bugs --- diff --git a/ultrix/if_ppp.c b/ultrix/if_ppp.c index ed41798..d93f5d3 100644 --- a/ultrix/if_ppp.c +++ b/ultrix/if_ppp.c @@ -72,7 +72,7 @@ * Robert Olsson 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 */ @@ -120,6 +120,8 @@ #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)); diff --git a/ultrix/if_ppp.h b/ultrix/if_ppp.h index 54dfa6d..40b5d3e 100644 --- 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. @@ -129,8 +129,6 @@ struct ifpppcstatsreq { #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_ */ diff --git a/ultrix/slcompress.c b/ultrix/slcompress.c index 1cbdd3f..971bdee 100644 --- 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). * - * $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" @@ -416,7 +416,8 @@ sl_uncompress_tcp(bufp, len, type, comp) 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);