From cb2e6b4e8d44a6ada2356d3a0772f1010c1f033f Mon Sep 17 00:00:00 2001
From: Andreas Gustafsson <source@isc.org>
Date: Mon, 3 Jul 2000 21:57:56 +0000
Subject: [PATCH] pullup:  300.   [bug]           Using both <isc/net.h> and
 <lwres/net.h> didn't work                         on platforms lacking IPv6
 because each included their                         own ipv6 header file for
 the missing definitions.  Now                         each library's ipv6.h
 defines the wrapper symbol of                         the other (ISC_IPV6_H
 and LWRES_IPV6_H).

---
 CHANGES                        | 6 ++++++
 lib/isc/include/isc/ipv6.h     | 8 +++++++-
 lib/lwres/include/lwres/ipv6.h | 8 +++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4d41eb5981..fae803e58d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+ 300.	[bug]		Using both <isc/net.h> and <lwres/net.h> didn't work
+			on platforms lacking IPv6 because each included their
+			own ipv6 header file for the missing definitions.  Now
+			each library's ipv6.h defines the wrapper symbol of
+			the other (ISC_IPV6_H and LWRES_IPV6_H).
+
 	--- 9.0.0b5 released ---
 
  298.	[bug]		A mutex deadlock occurred during shutdown of the
diff --git a/lib/isc/include/isc/ipv6.h b/lib/isc/include/isc/ipv6.h
index e212fc84b5..565bba1a93 100644
--- a/lib/isc/include/isc/ipv6.h
+++ b/lib/isc/include/isc/ipv6.h
@@ -15,11 +15,17 @@
  * SOFTWARE.
  */
 
-/* $Id: ipv6.h,v 1.13 2000/06/22 21:57:37 tale Exp $ */
+/* $Id: ipv6.h,v 1.13.2.1 2000/07/03 21:57:55 gson Exp $ */
 
 #ifndef ISC_IPV6_H
 #define ISC_IPV6_H 1
 
+/*
+ * Also define LWRES_IPV6_H to keep it from being included if liblwres is
+ * being used, or redefinition errors will occur.
+ */
+#define LWRES_IPV6_H 1
+
 /*****
  ***** Module Info
  *****/
diff --git a/lib/lwres/include/lwres/ipv6.h b/lib/lwres/include/lwres/ipv6.h
index 98d3323a57..f71e5de0ac 100644
--- a/lib/lwres/include/lwres/ipv6.h
+++ b/lib/lwres/include/lwres/ipv6.h
@@ -15,11 +15,17 @@
  * SOFTWARE.
  */
 
-/* $Id: ipv6.h,v 1.4 2000/06/23 03:12:42 tale Exp $ */
+/* $Id: ipv6.h,v 1.4.2.1 2000/07/03 21:57:56 gson Exp $ */
 
 #ifndef LWRES_IPV6_H
 #define LWRES_IPV6_H 1
 
+/*
+ * Also define ISC_IPV6_H to keep it from being included if libisc is
+ * being used, or redefinition errors will occur.
+ */
+#define ISC_IPV6_H 1
+
 /*****
  ***** Module Info
  *****/