[Bug 977] Fix mismatching #ifdefs for builds without IPv6

bk: 47e4b14a3zpuaVknodPuRmGa2PcEIQ

diff --git a/ChangeLog b/ChangeLog
index adea9219c6b8fa0f5ea27405d301c2eba3fc62e6..85141ddcf0926ddfefe1eadb432daf5789bf7058 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 977] Fix mismatching #ifdefs for builds without IPv6.
 * Update the copyright year.
 * Build system cleanup (make autogen-generated files writable).
 * [Bug 957] Windows only: Let command line parameters from the Windows SCM GUI

diff --git a/libisc/net.c b/libisc/net.c
index 19ef684bc597200ac7a2eba6f41fd7b61eb3880d..3d4ab66e7123eb9558c8741e206ebbf3f9a6e4eb 100644 (file)
--- a/libisc/net.c
+++ b/libisc/net.c
@@ -206,7 +206,6 @@ initialize_ipv6only(void) {
        RUNTIME_CHECK(isc_once_do(&once_ipv6only,
                                  try_ipv6only) == ISC_R_SUCCESS);
 }
-#endif /* IPV6_V6ONLY */
 
 static void
 try_ipv6pktinfo(void) {
@@ -257,6 +256,7 @@ initialize_ipv6pktinfo(void) {
                                  try_ipv6pktinfo) == ISC_R_SUCCESS);
 }
 #endif /* WANT_IPV6 */
+#endif /* ISC_PLATFORM_HAVEIPV6 */
 
 isc_result_t
 isc_net_probe_ipv6only(void) {