# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1300539497 -3600
# Node ID ff4cf3c8b89bf7fe2c2e944b56ee492de5a2d7c9
# Parent  77e1808cbbb6240a88e855e302b568f7c3898832
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
--- 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
--- 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
--- a/modules/inet_ntop
+++ b/modules/inet_ntop
@@ -6,7 +6,6 @@
 m4/inet_ntop.m4
 
 Depends-on:
-socklen
 sys_socket
 arpa_inet
 errno
diff --git a/modules/inet_pton b/modules/inet_pton
--- a/modules/inet_pton
+++ b/modules/inet_pton
@@ -7,7 +7,6 @@
 
 Depends-on:
 c-ctype
-socklen
 sys_socket
 arpa_inet
 errno