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 bdaca4662a492f93bc3483fe51a10760f6b172e2..aa0703c1991cc5b794d01201693ee0bcfe8f8bd0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -264,14 +264,12 @@ AC_CHECK_HEADERS(m4_normalize([
        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 3946782b2fc9c1470110712a8055c28169625dfa..f6f0dc11aa5798f8963fca03c9493803929e6250 100644 (file)
--- 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 c21c73d08d0609846697a292bcf80bff16fbf70e..479781ba4c7074fea373513265e76534b8300c29 100644 (file)
--- 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 @@ SYS_FUNC(getpmsg)
 #endif /* STREAMS syscalls support */
 
 
-#ifdef HAVE_SYS_POLL_H
-
 #include "xlat/pollflags.h"
 
 static int
@@ -319,10 +313,3 @@ SYS_FUNC(ppoll)
        }
        return rc;
 }
-
-#else /* !HAVE_SYS_POLL_H */
-SYS_FUNC(poll)
-{
-       return 0;
-}
-#endif