From: Rosen Penev <rosenp@gmail.com>
Date: Wed, 3 Apr 2019 22:57:40 +0000 (-0700)
Subject: Remove wrong poll.h include
X-Git-Tag: v2.5_beta1~326
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62063162;p=thirdparty%2Fopenvpn.git

Remove wrong poll.h include

musl reports:

warning redirecting incorrect #include <sys/poll.h> to <poll.h>

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20190403225740.8285-1-rosenp@gmail.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg18336.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/configure.ac b/configure.ac
index bcc74c32d..90fc90462 100644
--- a/configure.ac
+++ b/configure.ac
@@ -436,7 +436,7 @@ AC_CHECK_HEADERS([ \
 	unistd.h signal.h libgen.h stropts.h \
 	syslog.h pwd.h grp.h \
 	sys/sockio.h sys/uio.h linux/sockios.h \
-	linux/types.h sys/poll.h sys/epoll.h err.h \
+	linux/types.h poll.h sys/epoll.h err.h \
 ])
 
 SOCKET_INCLUDES="
diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h
index d2a503418..2b4c49ffa 100644
--- a/src/openvpn/syshead.h
+++ b/src/openvpn/syshead.h
@@ -179,8 +179,8 @@
 #include <resolv.h>
 #endif
 
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
+#ifdef HAVE_POLL_H
+#include <poll.h>
 #endif
 
 #ifdef HAVE_SYS_EPOLL_H