1816. [port] UnixWare: failed to compile lib/isc/unix/net.c.

                        [RT #13597]

diff --git a/CHANGES b/CHANGES
index 0c5fe12f5a367455e36c71d9b78b29f08a2c6d53..8dbadbc16ad719a125d838ab4879f32ac755e202 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -35,7 +35,8 @@
 
 1817.  [placeholder]   rt13587
 
-1816.  [placeholder]   rt13597
+1816.  [port]          UnixWare: failed to compile lib/isc/unix/net.c.
+                       [RT #13597]
 
 1815.  [bug]           nsupdate triggered a REQUIRE if the server was set
                        without also setting the zone and it encountered

diff --git a/lib/isc/unix/net.c b/lib/isc/unix/net.c
index e7f067bdfaea61e2eef9bf3a493c190ee238e4ee..b6c0cf74baee5ee5e2764cb0f0083d70e9b100b4 100644 (file)
--- a/lib/isc/unix/net.c
+++ b/lib/isc/unix/net.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.c,v 1.32 2005/02/24 00:33:34 marka Exp $ */
+/* $Id: net.c,v 1.33 2005/03/16 01:23:08 marka Exp $ */
 
 #include <config.h>
 
@@ -247,6 +247,7 @@ initialize_ipv6only(void) {
 }
 #endif /* IPV6_V6ONLY */
 
+#ifdef ISC_PLATFORM_HAVEIN6PKTINFO
 static void
 try_ipv6pktinfo(void) {
        int s, on;
@@ -299,6 +300,7 @@ initialize_ipv6pktinfo(void) {
        RUNTIME_CHECK(isc_once_do(&once_ipv6pktinfo,
                                  try_ipv6pktinfo) == ISC_R_SUCCESS);
 }
+#endif /* ISC_PLATFORM_HAVEIN6PKTINFO */
 #endif /* WANT_IPV6 */
 
 isc_result_t
@@ -316,11 +318,13 @@ isc_net_probe_ipv6only(void) {
 isc_result_t
 isc_net_probe_ipv6pktinfo(void) {
 #ifdef ISC_PLATFORM_HAVEIPV6
+#ifdef ISC_PLATFORM_HAVEIN6PKTINFO
 #ifdef WANT_IPV6
        initialize_ipv6pktinfo();
 #else
        ipv6pktinfo_result = ISC_R_NOTFOUND;
 #endif
+#endif
 #endif
        return (ipv6pktinfo_result);
 }