From: Paul Eggert Date: Sat, 19 Mar 2011 12:58:17 +0000 (+0100) Subject: inet_ntop, inet_pton: Simplify. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed39fd917449e87da736b651102b192510809b06;p=pspp 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 e59e2b1088..ca8525cb39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-03-19 Paul Eggert + Bruno Haible + + 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 Bruno Haible diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h index 6533c8fdd2..80dcb843e0 100644 --- a/lib/arpa_inet.in.h +++ b/lib/arpa_inet.in.h @@ -27,8 +27,8 @@ # include /* 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 diff --git a/modules/inet_ntop b/modules/inet_ntop index c6a1b80109..3b00b62a08 100644 --- 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 271d7785fb..44c50b892e 100644 --- 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