From 60d3a4d5d0c34facf11666ba07b3e400e948b076 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 19 Apr 2004 03:05:22 +0000 Subject: [PATCH] 1615. [port] Define ISC_SOCKADDR_LEN_T based on _BSD_SOCKLEN_T_ if it is defined. --- CHANGES | 3 +++ lib/isc/unix/socket.c | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 3449d6ce67..7b51afac38 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +1615. [port] Define ISC_SOCKADDR_LEN_T based on _BSD_SOCKLEN_T_ if + it is defined. + 1611. [bug] solaris: IPv6 interface scanning failed to cope with no active IPv6 interfaces. diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c index a4d4027214..d36cdfaff6 100644 --- a/lib/isc/unix/socket.c +++ b/lib/isc/unix/socket.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: socket.c,v 1.207.2.19.2.10 2004/04/15 02:10:41 marka Exp $ */ +/* $Id: socket.c,v 1.207.2.19.2.11 2004/04/19 03:05:22 marka Exp $ */ #include @@ -62,8 +62,12 @@ * some as socklen_t. This is here so it can be easily changed if needed. */ #ifndef ISC_SOCKADDR_LEN_T +#ifdef _BSD_SOCKLEN_T_ +#define ISC_SOCKADDR_LEN_T _BSD_SOCKLEN_T_ +#else #define ISC_SOCKADDR_LEN_T unsigned int #endif +#endif /* * Define what the possible "soft" errors can be. These are non-fatal returns