From e6ce1a0ea9ddc79fab12bf72e8eb8937498c5f66 Mon Sep 17 00:00:00 2001
From: David Lawrence <source@isc.org>
Date: Thu, 18 May 2000 22:43:48 +0000
Subject: [PATCH] use _PLATFORM_NEEDINETIN6H

---
 lib/isc/include/isc/platform.h.in     | 6 ++++++
 lib/isc/unix/include/isc/net.h        | 5 ++++-
 lib/lwres/include/lwres/net.h         | 5 ++++-
 lib/lwres/include/lwres/platform.h.in | 7 ++++++-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
index 345cc474a2..19a2f1b235 100644
--- a/lib/isc/include/isc/platform.h.in
+++ b/lib/isc/include/isc/platform.h.in
@@ -26,6 +26,12 @@
  *** Network.
  ***/
 
+/*
+ * Define if this system needs the <netinet/in6.h> header file included
+ * for full IPv6 support (pretty much only UnixWare).
+ */
+@ISC_PLATFORM_NEEDNETINETIN6H@
+
 /*
  * Define if this system needs the <netinet6/in6.h> header file included
  * to support in6_pkinfo (pretty much only BSD/OS).
diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h
index 09eac9d948..710e3ea132 100644
--- a/lib/isc/unix/include/isc/net.h
+++ b/lib/isc/unix/include/isc/net.h
@@ -73,8 +73,11 @@
 
 #include <netinet/in.h>		/* Contractual promise. */
 #include <arpa/inet.h>		/* Contractual promise. */
+#ifdef ISC_PLATFORM_NEEDNETINETIN6H
+#include <netinet/in6.h>	/* Required on UnixWare. */
+#endif
 #ifdef ISC_PLATFORM_NEEDNETINET6IN6H
-#include <netinet6/in6.h>	/* Required for in6_pktinfo. */
+#include <netinet6/in6.h>	/* Required on BSD/OS for in6_pktinfo. */
 #endif
 
 #include <isc/types.h>
diff --git a/lib/lwres/include/lwres/net.h b/lib/lwres/include/lwres/net.h
index d6f0ec2308..18d01d94f0 100644
--- a/lib/lwres/include/lwres/net.h
+++ b/lib/lwres/include/lwres/net.h
@@ -54,8 +54,11 @@
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#ifdef LWRES_PLATFORM_NEEDNETINETIN6H
+#include <netinet/in6.h>	/* Required on UnixWare. */
+#endif
 #ifdef LWRES_PLATFORM_NEEDNETINET6IN6H
-#include <netinet6/in6.h>
+#include <netinet6/in6.h>	/* Required on BSD/OS for in6_pktinfo. */
 #endif
 
 #include <lwres/result.h>
diff --git a/lib/lwres/include/lwres/platform.h.in b/lib/lwres/include/lwres/platform.h.in
index 3456e92235..a20452c075 100644
--- a/lib/lwres/include/lwres/platform.h.in
+++ b/lib/lwres/include/lwres/platform.h.in
@@ -27,7 +27,12 @@
  ***/
 
 /*
- * Define if this system has the <netinet6/in6.h> header file.
+ * Define if this system needs the <netinet/in6.h> header file for IPv6.
+ */
+@LWRES_PLATFORM_NEEDNETINETIN6H@
+
+/*
+ * Define if this system needs the <netinet6/in6.h> header file for IPv6.
  */
 @LWRES_PLATFORM_NEEDNETINET6IN6H@