summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1998-11-09 09:34:00 +0000
committerpeter <peter@FreeBSD.org>1998-11-09 09:34:00 +0000
commit6a35b23772b986124b28a774636425472b007dfe (patch)
treebc01dce91ddfef575e9e0ab9e739a8f5252a5511
parentbbf6ac0e806460a24f7ffc40c729c54aeb74bb5e (diff)
downloadFreeBSD-src-6a35b23772b986124b28a774636425472b007dfe.zip
FreeBSD-src-6a35b23772b986124b28a774636425472b007dfe.tar.gz
ifioctl takes a u_long rather than an int on 3.0
-rw-r--r--sys/dev/tx/if_tx.c6
-rw-r--r--sys/pci/if_tx.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index 3c46d05..d1a63ce 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -1,5 +1,5 @@
/* $OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $ */
-/* $Id: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $ */
+/* $Id: if_tx.c,v 1.16 1998/11/01 07:44:33 semenu Exp $ */
/*-
* Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
@@ -138,7 +138,11 @@
#endif
#if defined(__FreeBSD__)
+#if __FreeBSD_version >= 300000
+#define EPIC_IFIOCTL_CMD_TYPE u_long
+#else
#define EPIC_IFIOCTL_CMD_TYPE int
+#endif
#define EPIC_INTR_RET_TYPE void
#else /* __OpenBSD__ */
#define EPIC_IFIOCTL_CMD_TYPE u_long
diff --git a/sys/pci/if_tx.c b/sys/pci/if_tx.c
index 3c46d05..d1a63ce 100644
--- a/sys/pci/if_tx.c
+++ b/sys/pci/if_tx.c
@@ -1,5 +1,5 @@
/* $OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $ */
-/* $Id: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $ */
+/* $Id: if_tx.c,v 1.16 1998/11/01 07:44:33 semenu Exp $ */
/*-
* Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
@@ -138,7 +138,11 @@
#endif
#if defined(__FreeBSD__)
+#if __FreeBSD_version >= 300000
+#define EPIC_IFIOCTL_CMD_TYPE u_long
+#else
#define EPIC_IFIOCTL_CMD_TYPE int
+#endif
#define EPIC_INTR_RET_TYPE void
#else /* __OpenBSD__ */
#define EPIC_IFIOCTL_CMD_TYPE u_long
OpenPOWER on IntegriCloud