From: Paul Fertser <fercerpav@gmail.com>
Date: Sat, 29 Aug 2015 11:47:59 +0000 (+0300)
Subject: Change from sys/poll.h to standard poll.h location
X-Git-Tag: v0.10.0-rc1~406
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c1c4a6dd7f5f08cd801a323f1473d1a92543e336;p=openocd

Change from sys/poll.h to standard poll.h location

According to "man 2 poll" the correct header to include is poll.h, not
sys/poll.h. Reported by a build against musl.

Change-Id: I5298b49dc947d1a368e423104c0c0c7b9bdd1a10
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-on: http://openocd.zylin.com/2947
Tested-by: jenkins
---

diff --git a/configure.ac b/configure.ac
index 687a404f..87d4d6a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,11 +106,11 @@ AC_CHECK_HEADERS([netinet/tcp.h], [], [], [dnl
 # include <sys/socket.h>
 #endif
 ])
+AC_CHECK_HEADERS([poll.h])
 AC_CHECK_HEADERS([pthread.h])
 AC_CHECK_HEADERS([strings.h])
 AC_CHECK_HEADERS([sys/ioctl.h])
 AC_CHECK_HEADERS([sys/param.h])
-AC_CHECK_HEADERS([sys/poll.h])
 AC_CHECK_HEADERS([sys/select.h])
 AC_CHECK_HEADERS([sys/stat.h])
 AC_CHECK_HEADERS([sys/time.h])
diff --git a/src/helper/system.h b/src/helper/system.h
index f710cfb5..a6dfd7ec 100644
--- a/src/helper/system.h
+++ b/src/helper/system.h
@@ -56,8 +56,8 @@
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
+#ifdef HAVE_POLL_H
+#include <poll.h>
 #endif
 
 #ifdef __ECOS