Use arpa_inet in inet_?to?.

diff --git a/ChangeLog b/ChangeLog
index c4da857ad55d2471913215159cfc710d48b0221d..c0c8c6131e59407db272dd0d94c158f476f0c914 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-28  Simon Josefsson  <jas@extundo.com>
+
+       * modules/inet_ntop (Depends-on): Depend on arpa_inet.
+       * modules/inet_pton (Depends-on): Likewise.
+
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
        * modules/version-etc (Depends-on): Add stdarg.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index b15f391919c39e1739a9ede5d8463c8fb801d6c3..372e145a709be83e2f53e7d1a9a6b57be63199ab 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-28  Simon Josefsson  <jas@extundo.com>
+
+       * inet_ntop.h, inet_pton.h: No need to guard arpa/inet.h
+       #include's.
+
 2006-07-28  Bruno Haible <bruno@clisp.org>
 
        * 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 6d801585d5158a0fe8410d02005c2ab997223622..b581ab1438e2dafe04b5ff74e1cb842623352f9d 100644 (file)
--- a/lib/inet_ntop.h
+++ b/lib/inet_ntop.h
@@ -20,9 +20,7 @@
 #if HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #endif
-#if HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
+#include <arpa/inet.h>
 
 /* 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 bc2ee91e31238d7ab85b5d26fab1749b81c38554..86c801c5c1a63d742a1cb6739f5dc4adfeb1b854 100644 (file)
--- a/lib/inet_pton.h
+++ b/lib/inet_pton.h
@@ -20,9 +20,7 @@
 #if HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #endif
-#if HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
+#include <arpa/inet.h>
 
 #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 269e3cd9bd615d73dd9f88f8838b9b830ef2a8a9..0e05e47a8bd1d385a48fb7e946a66865939d5654 100644 (file)
--- 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 d673ef58019189a79e177926782b175f951313b8..a79eb677e672ed64964c914da0ccabd1366a8c47 100644 (file)
--- 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