From: Marcel Raad <raad@teamviewer.com>
Date: Mon, 10 Apr 2017 19:59:42 +0000 (+0200)
Subject: poll: prefer <poll.h> over <sys/poll.h>
X-Git-Tag: curl-7_54_0~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa573c3c55cda72ec5ef677d87f6f46a53385f0c;p=curl

poll: prefer <poll.h> over <sys/poll.h>

The POSIX standard location is <poll.h>. Using <sys/poll.h> results in
warning spam when using the musl standard library.

Closes https://github.com/curl/curl/pull/1406
---

diff --git a/lib/select.h b/lib/select.h
index e247bd9d0..4ed5dd2f8 100644
--- a/lib/select.h
+++ b/lib/select.h
@@ -24,10 +24,10 @@
 
 #include "curl_setup.h"
 
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
-#elif defined(HAVE_POLL_H)
+#ifdef HAVE_POLL_H
 #include <poll.h>
+#elif defined(HAVE_SYS_POLL_H)
+#include <sys/poll.h>
 #endif
 
 /*
diff --git a/src/tool_sleep.c b/src/tool_sleep.c
index d878512ac..e19db5a77 100644
--- a/src/tool_sleep.c
+++ b/src/tool_sleep.c
@@ -25,10 +25,10 @@
 #  include <sys/select.h>
 #endif
 
-#ifdef HAVE_SYS_POLL_H
-#  include <sys/poll.h>
-#elif defined(HAVE_POLL_H)
+#ifdef HAVE_POLL_H
 #  include <poll.h>
+#elif defined(HAVE_SYS_POLL_H)
+#  include <sys/poll.h>
 #endif
 
 #ifdef MSDOS