summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2013-11-06 01:17:05 +0000
committerDmitry V. Levin <ldv@altlinux.org>2013-11-11 15:27:01 +0000
commitd64a7e4755abe2d073676741f38328aa0b83db9f (patch)
tree4e2941209d79b180062db8eacad2e87efdfb8f97
parent2b640347869c4d6a0aa9b51c5812a80f84fc486a (diff)
downloadstrace-d64a7e4755abe2d073676741f38328aa0b83db9f.tar.gz
strace-d64a7e4755abe2d073676741f38328aa0b83db9f.tar.bz2
strace-d64a7e4755abe2d073676741f38328aa0b83db9f.tar.xz
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.
-rw-r--r--pathtrace.c5
-rw-r--r--stream.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/pathtrace.c b/pathtrace.c
index f76f3ce..03f6681 100644
--- 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 18a8ca9..f0c2af4 100644
--- 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