From cef62fd4295a59b748877c3928beb342aab758b6 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Fri, 28 Jul 2006 16:28:08 +0000
Subject: [PATCH] 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.
---
 lib/ChangeLog   | 9 +++++++++
 lib/inet_ntop.h | 5 ++++-
 lib/inet_pton.h | 5 ++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/ChangeLog b/lib/ChangeLog
index d15935025..b15f39191 100644
--- 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 69c838d39..6d801585d 100644
--- 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 353395bcc..bc2ee91e3 100644
--- 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
 
-- 
2.11.0