From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 22 Mar 2008 07:12:10 +0000 (-0500)
Subject: [Bug 977] Fix mismatching #ifdefs for builds without IPv6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6c782b2bcbd56890d03ba87b5d4fdd91c596cf1;p=thirdparty%2Fntp.git

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

bk: 47e4b14a3zpuaVknodPuRmGa2PcEIQ
---

diff --git a/ChangeLog b/ChangeLog
index adea9219c6..85141ddcf0 100644
--- 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 19ef684bc5..3d4ab66e71 100644
--- 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) {