moparisthebest/socat
1
0
Fork 0
mirror of https://github.com/moparisthebest/socat synced 2024-08-13 16:43:48 -04:00
Code Issues Releases Wiki Activity

Include <poll.h> instead of <sys/poll.h>

Browse Source
This commit is contained in:
Gerhard Rieger 2015-01-12 22:22:38 +01:00
parent ad524a56b7
commit 59a11f2efb
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -37,6 +37,10 @@ corrections:
to a random port instead of terminating with error.
Test: TCP4_NOPORT
porting:
Socat included <sys/poll.h> instead of POSIX <poll.h>
Thanks to John Spencer for reporting this issue.
####################### V 1.7.2.4:
corrections:

3
config.h.in
View File

@ -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

2
configure.in
View File

@ -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

4
sysincludes.h
View File

@ -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