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 687a404fd61c7b440f5e373bd053c1a79bb02885..87d4d6a04ca61fdc194d82ca9ca06093fbd5f46d 100644 (file)
--- 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 f710cfb5c5ac5717ca6fe975d027e844ba9d980b..a6dfd7ec1dd8bb25b268a754a8ac971f0081b1a1 100644 (file)
--- 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