| Message ID | 20190403225740.8285-1-rosenp@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [Openvpn-devel] Remove wrong poll.h include | expand |
Acked-by: Gert Doering <gert@greenie.muc.de> "This is what the standard says" - and we checked everything that we currently support (back to FreeBSD 7.4, old Solaris, AIX) and all systems have a poll.h, which is either a symlink to sys/poll.h or just does "#include <sys/poll.h>". So it's fairly much a no-op today, but might prevent compile-time issues on more standards-enforcing future systems... (very theoretical, this) Your patch has been applied to the master branch. commit 6206316275b14bd433a8651568f0185f4fa9f038 Author: Rosen Penev Date: Wed Apr 3 15:57:40 2019 -0700 Remove wrong poll.h include 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> -- kind regards, Gert Doering
diff --git a/configure.ac b/configure.ac index 891799ea..37880d29 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 d2a50341..2b4c49ff 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
musl reports: warning redirecting incorrect #include <sys/poll.h> to <poll.h> Signed-off-by: Rosen Penev <rosenp@gmail.com> --- configure.ac | 2 +- src/openvpn/syshead.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)