bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2025-01-08 22:12:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Gerhard Rieger 2015-04-01 15:41:53 +02:00
parent c90dd2ce88
commit 5c41b5cff2
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

@ -18,6 +18,7 @@ security:
Turn off nested signal handler invocations Turn off nested signal handler invocations
Thanks to Peter Lobsinger for reporting and explaining this issue. Thanks to Peter Lobsinger for reporting and explaining this issue.
corrections: corrections:
LISTEN based addresses applied some address options, e.g. so-keepalive, LISTEN based addresses applied some address options, e.g. so-keepalive,
to the listening file descriptor instead of the connected file 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 added struct sockaddr_ll to union sockaddr_union to avoid "strict
aliasing" warnings (problem reported by Paul Wouters) 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: new features:
added option max-children that limits the number of concurrent child added option max-children that limits the number of concurrent child
processes. Thanks to Sam Liddicott for providing the patch. processes. Thanks to Sam Liddicott for providing the patch.

3
config.h.in
View file

@ -185,6 +185,9 @@
/* Define if you have the <sys/types.h> header file. */ /* Define if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H #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. */ /* Define if you have the <sys/poll.h> header file. */
#undef HAVE_SYS_POLL_H #undef HAVE_SYS_POLL_H

2
configure.in
View file

@ -60,7 +60,7 @@ AC_HEADER_STDC
AC_CHECK_HEADERS(inttypes.h) AC_CHECK_HEADERS(inttypes.h)
AC_HEADER_SYS_WAIT 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(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(pty.h)
AC_CHECK_HEADERS(netinet/in.h netinet/in_systm.h) AC_CHECK_HEADERS(netinet/in.h netinet/in_systm.h)
AC_CHECK_HEADERS(netinet/ip.h, [], [], [AC_INCLUDES_DEFAULT AC_CHECK_HEADERS(netinet/ip.h, [], [], [AC_INCLUDES_DEFAULT

4
sysincludes.h
View file

@ -54,7 +54,9 @@
#if HAVE_SYS_TYPES_H #if HAVE_SYS_TYPES_H
#include <sys/types.h> /* pid_t, select(), socket(), connect(), open(), u_short */ #include <sys/types.h> /* pid_t, select(), socket(), connect(), open(), u_short */
#endif #endif
#if HAVE_SYS_POLL_H #if HAVE_POLL_H
#include <poll.h> /* poll() */
#elif HAVE_SYS_POLL_H
#include <sys/poll.h> /* poll() */ #include <sys/poll.h> /* poll() */
#endif #endif
#if HAVE_SYS_SOCKET_H #if HAVE_SYS_SOCKET_H