Assume that <poll.h> is available
* configure.ac (AC_CHECK_HEADERS): Remove poll.h and sys/poll.h.
* pathtrace.c: Include <poll.h> unconditionally.
* stream.c: Likewise.
[HAVE_SYS_POLL_H]: Compile unconditionally.
[!HAVE_SYS_POLL_H]: Remove.
diff --git a/configure.ac b/configure.ac
index bdaca46..aa0703c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -264,14 +264,12 @@
linux/utsname.h
mqueue.h
netinet/sctp.h
- poll.h
scsi/sg.h
stropts.h
sys/conf.h
sys/epoll.h
sys/fanotify.h
sys/ioctl.h
- sys/poll.h
sys/reg.h
sys/vfs.h
sys/xattr.h
diff --git a/pathtrace.c b/pathtrace.c
index 3946782..f6f0dc1 100644
--- a/pathtrace.c
+++ b/pathtrace.c
@@ -28,11 +28,7 @@
#include "defs.h"
#include <sys/param.h>
-#if defined HAVE_POLL_H
-# include <poll.h>
-#elif defined HAVE_SYS_POLL_H
-# include <sys/poll.h>
-#endif
+#include <poll.h>
#include "syscall.h"
diff --git a/stream.c b/stream.c
index c21c73d..479781b 100644
--- a/stream.c
+++ b/stream.c
@@ -27,11 +27,7 @@
*/
#include "defs.h"
-#if defined HAVE_POLL_H
-# include <poll.h>
-#elif defined HAVE_SYS_POLL_H
-# include <sys/poll.h>
-#endif
+#include <poll.h>
#ifdef HAVE_SYS_CONF_H
# include <sys/conf.h>
#endif
@@ -156,8 +152,6 @@
#endif /* STREAMS syscalls support */
-#ifdef HAVE_SYS_POLL_H
-
#include "xlat/pollflags.h"
static int
@@ -319,10 +313,3 @@
}
return rc;
}
-
-#else /* !HAVE_SYS_POLL_H */
-SYS_FUNC(poll)
-{
- return 0;
-}
-#endif