From: Dmitry V. Levin <ldv@altlinux.org>
Date: Wed, 6 Nov 2013 01:17:05 +0000 (+0000)
Subject: Include <sys/poll.h> only if there is no <poll.h>
X-Git-Tag: v4.9~166
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d64a7e4755abe2d073676741f38328aa0b83db9f;p=platform%2Fupstream%2Fstrace.git

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 f76f3ced..03f6681f 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 18a8ca94..f0c2af48 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