fix compilation problems

diff --git a/freebsd-2.0/if_ppp.c b/freebsd-2.0/if_ppp.c
index 4388646c63373b9d6ae24fb89cae95e53c8241fd..6e450ea5687968e15a7932b60d1dcc1d1b9845f4 100644 (file)
--- a/freebsd-2.0/if_ppp.c
+++ b/freebsd-2.0/if_ppp.c
@@ -69,7 +69,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $Id: if_ppp.c,v 1.10 1996/10/08 04:38:03 paulus Exp $ */
+/* $Id: if_ppp.c,v 1.11 1997/03/04 03:27:28 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 */
 
@@ -127,6 +127,9 @@
 #include <net/ppp-comp.h>
 #endif
 
+static int     pppsioctl __P((struct ifnet *, int, caddr_t));
+static int     pppoutput __P((struct ifnet *, struct mbuf *,
+                              struct sockaddr *, struct rtentry *));
 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));
@@ -310,7 +313,7 @@ pppdealloc(sc)
 int
 pppioctl(sc, cmd, data, flag, p)
     struct ppp_softc *sc;
-    u_long cmd;
+    int cmd;
     caddr_t data;
     int flag;
     struct proc *p;
@@ -487,7 +490,7 @@ pppioctl(sc, cmd, data, flag, p)
 int
 pppsioctl(ifp, cmd, data)
     register struct ifnet *ifp;
-    u_long cmd;
+    int cmd;
     caddr_t data;
 {
     struct proc *p = curproc;  /* XXX */

diff --git a/freebsd-2.0/if_pppvar.h b/freebsd-2.0/if_pppvar.h
index 22a5e4cc6417a7490a91438a221e389bf4b86533..e91e8899cc796d52e02497f4da8cc8230a600345 100644 (file)
--- a/freebsd-2.0/if_pppvar.h
+++ b/freebsd-2.0/if_pppvar.h
@@ -1,4 +1,4 @@
-/*     $Id: if_pppvar.h,v 1.3 1996/10/08 04:38:03 paulus Exp $ */
+/*     $Id: if_pppvar.h,v 1.4 1997/03/04 03:27:28 paulus Exp $ */
 /*
  * if_pppvar.h - private structures and declarations for PPP.
  *
@@ -97,7 +97,7 @@ struct        ppp_softc ppp_softc[NPPP];
 
 struct ppp_softc *pppalloc __P((pid_t pid));
 void   pppdealloc __P((struct ppp_softc *sc));
-int    pppioctl __P((struct ppp_softc *sc, u_long cmd, caddr_t data,
+int    pppioctl __P((struct ppp_softc *sc, int cmd, caddr_t data,
                      int flag, struct proc *p));
 void   ppp_restart __P((struct ppp_softc *sc));
 void   ppppktin __P((struct ppp_softc *sc, struct mbuf *m, int lost));

diff --git a/freebsd-2.0/ppp_tty.c b/freebsd-2.0/ppp_tty.c
index 7eee2b134aa29bc8764635858ace6591e05eff88..f06c4d7d32a69edcd23c62d246bae9be788fba06 100644 (file)
--- a/freebsd-2.0/ppp_tty.c
+++ b/freebsd-2.0/ppp_tty.c
@@ -70,7 +70,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $Id: ppp_tty.c,v 1.6 1996/07/01 05:25:56 paulus Exp $ */
+/* $Id: ppp_tty.c,v 1.7 1997/03/04 03:27:28 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 */
 
@@ -112,7 +112,7 @@ int pppopen __P((dev_t dev, struct tty *tp));
 int    pppclose __P((struct tty *tp, int flag));
 int    pppread __P((struct tty *tp, struct uio *uio, int flag));
 int    pppwrite __P((struct tty *tp, struct uio *uio, int flag));
-int    ppptioctl __P((struct tty *tp, u_long cmd, caddr_t data, int flag,
+int    ppptioctl __P((struct tty *tp, int cmd, caddr_t data, int flag,
                       struct proc *));
 int    pppinput __P((int c, struct tty *tp));
 int    pppstart __P((struct tty *tp));
@@ -397,7 +397,7 @@ pppwrite(tp, uio, flag)
 int
 ppptioctl(tp, cmd, data, flag, p)
     struct tty *tp;
-    u_long cmd;
+    int cmd;
     caddr_t data;
     int flag;
     struct proc *p;