From 75c7f7cf4b907698063410d7f019049b5849e79c Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Fri, 28 Jul 2006 16:47:24 +0000 Subject: [PATCH] Use arpa_inet in inet_?to?. --- ChangeLog | 5 +++++ lib/ChangeLog | 5 +++++ lib/inet_ntop.h | 4 +--- lib/inet_pton.h | 4 +--- modules/inet_ntop | 1 + modules/inet_pton | 1 + 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4da857ad5..c0c8c6131e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-07-28 Simon Josefsson + + * modules/inet_ntop (Depends-on): Depend on arpa_inet. + * modules/inet_pton (Depends-on): Likewise. + 2006-07-25 Bruno Haible * modules/version-etc (Depends-on): Add stdarg. diff --git a/lib/ChangeLog b/lib/ChangeLog index b15f391919..372e145a70 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2006-07-28 Simon Josefsson + + * inet_ntop.h, inet_pton.h: No need to guard arpa/inet.h + #include's. + 2006-07-28 Bruno Haible * inet_ntop.h, inet_pton.h: Use #if HAVE* instead of #ifdef HAVE*. diff --git a/lib/inet_ntop.h b/lib/inet_ntop.h index 6d801585d5..b581ab1438 100644 --- a/lib/inet_ntop.h +++ b/lib/inet_ntop.h @@ -20,9 +20,7 @@ #if HAVE_NETINET_IN_H # include #endif -#if HAVE_ARPA_INET_H -# include -#endif +#include /* Converts an internet address from internal format to a printable, presentable format. diff --git a/lib/inet_pton.h b/lib/inet_pton.h index bc2ee91e31..86c801c5c1 100644 --- a/lib/inet_pton.h +++ b/lib/inet_pton.h @@ -20,9 +20,7 @@ #if HAVE_NETINET_IN_H # include #endif -#if HAVE_ARPA_INET_H -# include -#endif +#include #if !HAVE_DECL_INET_PTON extern int inet_pton (int af, const char *restrict src, void *restrict dst); diff --git a/modules/inet_ntop b/modules/inet_ntop index 269e3cd9bd..0e05e47a8b 100644 --- a/modules/inet_ntop +++ b/modules/inet_ntop @@ -10,6 +10,7 @@ Depends-on: restrict socklen sys_socket +arpa_inet configure.ac: gl_INET_NTOP diff --git a/modules/inet_pton b/modules/inet_pton index d673ef5801..a79eb677e6 100644 --- a/modules/inet_pton +++ b/modules/inet_pton @@ -10,6 +10,7 @@ Depends-on: restrict socklen sys_socket +arpa_inet configure.ac: gl_INET_PTON -- 2.30.2