Include <sys/poll.h> only if there is no <poll.h>

* pathtrace.c: Do not include <sys/poll.h> if <poll.h> is available.
* stream.c: Likewise.

diff --git a/pathtrace.c b/pathtrace.c
index f76f3ced6251c85cc460bbf3c757379be68568cb..03f6681fff3d2ab93634e7deab06b6ac94f051c6 100644 (file)
--- a/pathtrace.c
+++ b/pathtrace.c
@@ -28,10 +28,9 @@
 
 #include "defs.h"
 #include <sys/param.h>
-#ifdef HAVE_POLL_H
+#if defined HAVE_POLL_H
 # include <poll.h>
-#endif
-#ifdef HAVE_SYS_POLL_H
+#elif defined HAVE_SYS_POLL_H
 # include <sys/poll.h>
 #endif
 

diff --git a/stream.c b/stream.c
index 18a8ca94c7959e697ce159b604da6c43eb49d88d..f0c2af48876186f481721bd80997bff38cd9d00d 100644 (file)
--- a/stream.c
+++ b/stream.c
@@ -27,10 +27,9 @@
  */
 
 #include "defs.h"
-#ifdef HAVE_POLL_H
+#if defined HAVE_POLL_H
 # include <poll.h>
-#endif
-#ifdef HAVE_SYS_POLL_H
+#elif defined HAVE_SYS_POLL_H
 # include <sys/poll.h>
 #endif
 #ifdef HAVE_SYS_CONF_H