From 35497aa4f993e031cadd62bdfe63ca4de5591f26 Mon Sep 17 00:00:00 2001 From: Gerhard Rieger Date: Sun, 3 Feb 2008 20:56:52 +0100 Subject: [PATCH] fixed bugs with struct ip_mreq --- CHANGES | 3 +++ VERSION | 2 +- xiohelp.c | 4 ++-- xioopts.h | 4 +++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 893e422..25cb4a8 100644 --- a/CHANGES +++ b/CHANGES @@ -29,6 +29,9 @@ corrections: corrected option handling with STDIO; usecase: cool-write + fixed small bugs on systems with struct ip_mreq without struct ip_mreqn + (thanks to Roland Illig for sending a patch) + corrected name of option intervall to interval (old form still valid for us German speaking guys) diff --git a/VERSION b/VERSION index 5865eb9..eece788 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -"1.6.0.0+execpty+servres+fd_setsize+udp_sigchld+stdio_opts+interval" +"1.6.0.0+execpty+servres+fd_setsize+udp_sigchld+stdio_opts+interval+mreq_help" diff --git a/xiohelp.c b/xiohelp.c index d44ece5..a994cdb 100644 --- a/xiohelp.c +++ b/xiohelp.c @@ -1,5 +1,5 @@ /* source: xiohelp.c */ -/* Copyright Gerhard Rieger 2001-2007 */ +/* Copyright Gerhard Rieger 2001-2008 */ /* Published under the GNU General Public License V.2, see file COPYING */ /* this file contains the source for the help function */ @@ -25,7 +25,7 @@ static const char *optiontypenames[] = { "OFF_T", "OFF64_T", #if HAVE_STRUCT_IP_MREQN "STRUCT-IP_MREQN", -#elif HAVE_STRUCT_IP_MREQN +#elif HAVE_STRUCT_IP_MREQ "STRUCT-IP_MREQ", #endif "IP4NAME", diff --git a/xioopts.h b/xioopts.h index 91291e9..849cb46 100644 --- a/xioopts.h +++ b/xioopts.h @@ -1,5 +1,5 @@ /* source: xioopts.h */ -/* Copyright Gerhard Rieger 2001-2007 */ +/* Copyright Gerhard Rieger 2001-2008 */ /* Published under the GNU General Public License V.2, see file COPYING */ #ifndef __xioopts_h_included @@ -49,7 +49,9 @@ enum e_types { TYPE_LONGLONG, /* long long */ TYPE_OFF32, /* off_t */ TYPE_OFF64, /* off64_t */ +#if HAVE_STRUCT_IP_MREQ || HAVE_STRUCT_IP_MREQN TYPE_IP_MREQN, /* for struct ip_mreq or struct ip_mreqn */ +#endif TYPE_IP4NAME, /* IPv4 hostname or address */ TYPE_2BYTE = TYPE_USHORT