2006-07-28 Bruno Haible <bruno@clisp.org>

	* inet_ntop.h, inet_pton.h: Use #if HAVE* instead of #ifdef HAVE*.

2006-07-28  Yoann Vandoorselaere <yoann.v@prelude-ids.com>

	* inet_ntop.h, inet_pton.h: Need to include netinet/in.h before
	arpa/inet.h.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index d15935025c93e6ebb4c28f77d6f998be1a0c1155..b15f391919c39e1739a9ede5d8463c8fb801d6c3 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-28  Bruno Haible <bruno@clisp.org>
+
+       * inet_ntop.h, inet_pton.h: Use #if HAVE* instead of #ifdef HAVE*.
+
+2006-07-28  Yoann Vandoorselaere <yoann.v@prelude-ids.com>
+
+       * inet_ntop.h, inet_pton.h: Need to include netinet/in.h before
+       arpa/inet.h.
+
 2006-07-28  Bruno Haible  <bruno@clisp.org>
 
        * mbchar.h (iswalnum, iswalpha, iswblank, iswcntrl, iswdigit, iswgraph,

diff --git a/lib/inet_ntop.h b/lib/inet_ntop.h
index 69c838d390ca159f693d6a4144221d6d8c23008c..6d801585d5158a0fe8410d02005c2ab997223622 100644 (file)
--- a/lib/inet_ntop.h
+++ b/lib/inet_ntop.h
@@ -17,7 +17,10 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#ifdef HAVE_ARPA_INET_H
+#if HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#if HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
 

diff --git a/lib/inet_pton.h b/lib/inet_pton.h
index 353395bccb9145c0a85075a2b3b7063f6e5ed9df..bc2ee91e31238d7ab85b5d26fab1749b81c38554 100644 (file)
--- a/lib/inet_pton.h
+++ b/lib/inet_pton.h
@@ -17,7 +17,10 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#ifdef HAVE_ARPA_INET_H
+#if HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#if HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif