1615. [port] Define ISC_SOCKADDR_LEN_T based on _BSD_SOCKLEN_T_ if

                        it is defined.

diff --git a/CHANGES b/CHANGES
index f487f9a19e4fd1f1eeb23ec94d7247b8df072487..ed08d4ae14780146a2bcc6a4de9c1f560bffc228 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1615.  [port]          Define ISC_SOCKADDR_LEN_T based on _BSD_SOCKLEN_T_ if
+                       it is defined.
+
 1610.  [bug]           On dual stack machines "dig -b" failed to set the
                        address type to be looked up with "@server".
                        [RT #11069]

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 3e66b058b4b711a88e3afdb5fee551d59c603cbe..52a802d843d1505c79995b53669555c27be2880a 100644 (file)
--- 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.26 2004/04/15 02:16:29 marka Exp $ */
+/* $Id: socket.c,v 1.207.2.27 2004/04/19 02:56:46 marka Exp $ */
 
 #include <config.h>
 
@@ -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