From c1c4a6dd7f5f08cd801a323f1473d1a92543e336 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Sat, 29 Aug 2015 14:47:59 +0300 Subject: [PATCH] Change from sys/poll.h to standard poll.h location MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Andreas Färber Reviewed-on: http://openocd.zylin.com/2947 Tested-by: jenkins --- configure.ac | 2 +- src/helper/system.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 #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 #endif -#ifdef HAVE_SYS_POLL_H -#include +#ifdef HAVE_POLL_H +#include #endif #ifdef __ECOS -- 2.39.2