From 5c41b5cff2a3060371f8a21565c47dc12c868cab Mon Sep 17 00:00:00 2001
From: Gerhard Rieger <gerhard@dest-unreach.org>
Date: Wed, 1 Apr 2015 15:41:53 +0200
Subject: [PATCH] Include <poll.h> instead of <sys/poll.h>

---
 CHANGES       | 4 ++++
 config.h.in   | 3 +++
 configure.in  | 2 +-
 sysincludes.h | 4 +++-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index e14c57b..154ed14 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,7 @@ security:
 	Turn off nested signal handler invocations
 	Thanks to Peter Lobsinger for reporting and explaining this issue.
 
+
 corrections:
 	LISTEN based addresses applied some address options, e.g. so-keepalive,
 	to the listening file descriptor instead of the connected file
@@ -264,6 +265,9 @@ porting:
 	added struct sockaddr_ll to union sockaddr_union to avoid "strict
 	aliasing" warnings (problem reported by Paul Wouters)
 
+	Socat included <sys/poll.h> instead of POSIX <poll.h>
+	Thanks to John Spencer for reporting this issue.
+
 new features:
 	added option max-children that limits the number of concurrent child
 	processes. Thanks to Sam Liddicott for providing the patch.
diff --git a/config.h.in b/config.h.in
index a2bd153..232ed6b 100644
--- a/config.h.in
+++ b/config.h.in
@@ -185,6 +185,9 @@
 /* Define if you have the <sys/types.h> header file.  */
 #undef HAVE_SYS_TYPES_H
 
+/* Define if you have the <poll.h> header file.  */
+#undef HAVE_POLL_H
+
 /* Define if you have the <sys/poll.h> header file.  */
 #undef HAVE_SYS_POLL_H
 
diff --git a/configure.in b/configure.in
index f25dbda..64b8ad9 100644
--- a/configure.in
+++ b/configure.in
@@ -60,7 +60,7 @@ AC_HEADER_STDC
 AC_CHECK_HEADERS(inttypes.h)
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/param.h sys/ioctl.h sys/time.h syslog.h unistd.h)
-AC_CHECK_HEADERS(pwd.h grp.h stdint.h sys/types.h sys/poll.h sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
+AC_CHECK_HEADERS(pwd.h grp.h stdint.h sys/types.h poll.h sys/poll.h sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
 AC_CHECK_HEADERS(pty.h)
 AC_CHECK_HEADERS(netinet/in.h netinet/in_systm.h)
 AC_CHECK_HEADERS(netinet/ip.h, [], [], [AC_INCLUDES_DEFAULT
diff --git a/sysincludes.h b/sysincludes.h
index b79fd09..2995b3c 100644
--- a/sysincludes.h
+++ b/sysincludes.h
@@ -54,7 +54,9 @@
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>	/* pid_t, select(), socket(), connect(), open(), u_short */
 #endif
-#if HAVE_SYS_POLL_H
+#if HAVE_POLL_H
+#include <poll.h>    /* poll() */
+#elif HAVE_SYS_POLL_H
 #include <sys/poll.h>	/* poll() */
 #endif
 #if HAVE_SYS_SOCKET_H