aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorGarrett Wollman <wollman@FreeBSD.org>2001-01-20 02:24:07 +0000
committerGarrett Wollman <wollman@FreeBSD.org>2001-01-20 02:24:07 +0000
commit074a4a2c84c275e84ad3bd19638db7bcb0e8eb62 (patch)
treeac581eceffcd7025904f5281e887ea2697f28783 /sys
parent4848fbae35c7ac6118cdc0c3d4e860abc6faae3b (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/compat/svr4/svr4_stream.c1
-rw-r--r--sys/dev/bktr/bktr_i2c.c5
-rw-r--r--sys/dev/mse/mse.c2
-rw-r--r--sys/i386/isa/asc.c2
-rw-r--r--sys/i386/isa/mse.c2
-rw-r--r--sys/i386/isa/tw.c2
-rw-r--r--sys/i4b/layer4/i4b_i4bdrv.c4
-rw-r--r--sys/pc98/pc98/mse.c2
8 files changed, 14 insertions, 6 deletions
diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c
index 750e9c9158155..6bf2155e7979a 100644
--- a/sys/compat/svr4/svr4_stream.c
+++ b/sys/compat/svr4/svr4_stream.c
@@ -46,7 +46,6 @@
#include <sys/filedesc.h>
#include <sys/fcntl.h>
#include <sys/filio.h>
-#include <sys/select.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/un.h>
diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c
index 0979db99ebdee..4f61e5c1b8936 100644
--- a/sys/dev/bktr/bktr_i2c.c
+++ b/sys/dev/bktr/bktr_i2c.c
@@ -41,7 +41,12 @@
#include <sys/module.h>
#include <sys/bus.h>
#include <sys/uio.h>
+
+#if __FreeBSD_version >= 500014
+#include <sys/selinfo.h>
+#else
#include <sys/select.h>
+#endif
#if (__FreeBSD_version < 500000)
#include <machine/clock.h> /* for DELAY */
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index dbf72cca754a0..926857482aec3 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -50,7 +50,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/poll.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
#include <sys/uio.h>
#include <sys/mouse.h>
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index 8b096195b0a1b..086e0c0480228 100644
--- a/sys/i386/isa/asc.c
+++ b/sys/i386/isa/asc.c
@@ -45,7 +45,7 @@
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/poll.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
#include <sys/uio.h>
#include <sys/bus.h>
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index dbf72cca754a0..926857482aec3 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -50,7 +50,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/poll.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
#include <sys/uio.h>
#include <sys/mouse.h>
diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c
index 212c06427448f..037e9431045ac 100644
--- a/sys/i386/isa/tw.c
+++ b/sys/i386/isa/tw.c
@@ -146,7 +146,7 @@
#include <sys/conf.h>
#include <sys/uio.h>
#include <sys/syslog.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
#include <sys/poll.h>
#include <sys/bus.h>
#define MIN(a,b) ((a)<(b)?(a):(b))
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index 3aef6cb3bcfbe..156260ef1ec7f 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -58,7 +58,11 @@
#include <sys/conf.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
+#if __FreeBSD_version >= 500014
+#include <sys/selinfo.h>
+#else
#include <sys/select.h>
+#endif
#include <net/if.h>
#ifdef __NetBSD__
diff --git a/sys/pc98/pc98/mse.c b/sys/pc98/pc98/mse.c
index 3b8ee54ce1157..56eeab93117bc 100644
--- a/sys/pc98/pc98/mse.c
+++ b/sys/pc98/pc98/mse.c
@@ -50,7 +50,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/poll.h>
-#include <sys/select.h>
+#include <sys/selinfo.h>
#include <sys/uio.h>
#include <machine/bus.h>