inet_ntop, inet_pton: Simplify.

* modules/inet_ntop (Depends-on): Remove socklen, since sys_socket is
documented to provide socklen_t and we already depend on sys_socket.
* modules/inet_pton (Depends-on): Likewise.
* lib/arpa_inet.in.h: Adjust comment.

diff --git a/ChangeLog b/ChangeLog
index e59e2b1088d77569312043d0e222f3201774a1dd..ca8525cb3964ef98894bae88407b608f9b78d751 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-03-19  Paul Eggert  <eggert@cs.ucla.edu>
+            Bruno Haible  <bruno@clisp.org>
+
+       inet_ntop, inet_pton: Simplify.
+       * modules/inet_ntop (Depends-on): Remove socklen, since sys_socket is
+       documented to provide socklen_t and we already depend on sys_socket.
+       * modules/inet_pton (Depends-on): Likewise.
+       * lib/arpa_inet.in.h: Adjust comment.
+
 2011-03-19  Paul Eggert  <eggert@cs.ucla.edu>
             Bruno Haible  <bruno@clisp.org>
 

diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h
index 6533c8fdd2092cecb28c4802dfab5fd4609ebcb5..80dcb843e0735bf23dd0e02b02afecc9fcbcb3e4 100644 (file)
--- a/lib/arpa_inet.in.h
+++ b/lib/arpa_inet.in.h
@@ -27,8 +27,8 @@
 # include <features.h> /* for __GLIBC__ */
 #endif
 
-/* Gnulib's sys/socket.h is responsible for pulling in winsock2.h etc
-   under MinGW.
+/* Gnulib's sys/socket.h is responsible for defining socklen_t (used below) and
+   for pulling in winsock2.h etc. under MinGW.
    But avoid namespace pollution on glibc systems.  */
 #ifndef __GLIBC__
 # include <sys/socket.h>

diff --git a/modules/inet_ntop b/modules/inet_ntop
index c6a1b80109ddca9f79aaf07851d1da6a1424b2fe..3b00b62a08b627fc85924c86fb2a467dde14495a 100644 (file)
--- a/modules/inet_ntop
+++ b/modules/inet_ntop
@@ -6,7 +6,6 @@ lib/inet_ntop.c
 m4/inet_ntop.m4
 
 Depends-on:
-socklen
 sys_socket
 arpa_inet
 errno

diff --git a/modules/inet_pton b/modules/inet_pton
index 271d7785fbb842f4823dcf7f7d7931f4d16c1d87..44c50b892e579619a399020f036fcd9131c69834 100644 (file)
--- a/modules/inet_pton
+++ b/modules/inet_pton
@@ -7,7 +7,6 @@ m4/inet_pton.m4
 
 Depends-on:
 c-ctype
-socklen
 sys_socket
 arpa_inet
 errno