Use the right types on 64-bit machines

diff --git a/sys/netinet/ip_fil.c b/sys/netinet/ip_fil.c
index 2fce562..fa96d88 100644 (file)
--- a/sys/netinet/ip_fil.c
+++ b/sys/netinet/ip_fil.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip_fil.c,v 1.12 1997/03/31 15:52:45 kstailey Exp $    */
+/*     $OpenBSD: ip_fil.c,v 1.13 1997/04/18 06:10:08 niklas Exp $      */
 /*
  * (C)opyright 1993,1994,1995 by Darren Reed.
  *
@@ -75,7 +75,7 @@ static        int     iplused = 0;
 static int     (*fr_savep) __P((ip_t *, int, struct ifnet *, int,
                                struct mbuf **));
 static void    frflush __P((caddr_t));
-static int     frrequest __P((int, caddr_t, int));
+static int     frrequest __P((u_long, caddr_t, int));
 
 #if _BSDI_VERSION >= 199501
 # include <sys/device.h>
@@ -406,8 +406,9 @@ iplioctl(dev, cmd, data, mode
 
 static int
 frrequest(req, data, set)
-     int req, set;
+     u_long req;
      caddr_t data;
+     int set;
 {
        register frentry_t *fp, *f, **fprev;
        register frentry_t **ftail;

diff --git a/sys/netinet/ip_nat.c b/sys/netinet/ip_nat.c
index d671351..a2ce5a9 100644 (file)
--- a/sys/netinet/ip_nat.c
+++ b/sys/netinet/ip_nat.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip_nat.c,v 1.10 1997/02/13 18:13:31 kstailey Exp $    */
+/*     $OpenBSD: ip_nat.c,v 1.11 1997/04/18 06:10:07 niklas Exp $      */
 /*
  * (C)opyright 1995-1996 by Darren Reed.
  *
@@ -165,7 +165,8 @@ fix_incksum(sp, n)
 int
 nat_ioctl(data, cmd, mode)
        caddr_t data;
-       int cmd, mode;
+       u_long cmd;
+       int mode;
 {
        register ipnat_t *nat, *n = NULL, **np = NULL;
        ipnat_t natd;

diff --git a/sys/netinet/ip_nat.h b/sys/netinet/ip_nat.h
index 47b6432..6de60c4 100644 (file)
--- a/sys/netinet/ip_nat.h
+++ b/sys/netinet/ip_nat.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip_nat.h,v 1.5 1997/02/11 22:23:27 kstailey Exp $     */
+/*     $OpenBSD: ip_nat.h,v 1.6 1997/04/18 06:10:07 niklas Exp $       */
 /*
  * (C)opyright 1995 by Darren Reed.
  *
@@ -112,7 +112,7 @@ typedef     struct  natstat {
 #define        IPN_TCPUDP      3
 
 extern nat_t *nat_table[2][NAT_SIZE];
-extern int nat_ioctl __P((caddr_t, int, int));
+extern int nat_ioctl __P((caddr_t, u_long, int));
 extern nat_t *nat_outlookup __P((int, struct in_addr, u_short, struct in_addr,
                                 u_short));
 extern nat_t *nat_inlookup __P((int, struct in_addr, u_short, struct in_addr,