From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 13 Dec 2007 09:55:28 +0000 (-0500)
Subject: [Bug 977] Fix mismatching #ifdefs for builds without IPv6
X-Git-Tag: NTP_4_2_5P106~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=239a67c482994f5b280c04e171f88ded97e046d7;p=thirdparty%2Fntp.git

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

bk: 47610190yASZpyGUhx2rPzCT6_v5Ag
---

diff --git a/ChangeLog b/ChangeLog
index e284130de..12019f9f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
-* [Bug 830] Fix the checking order of the interface options
+* [Bug 977] Fix mismatching #ifdefs for builds without IPv6.
+* [Bug 830] Fix the checking order of the interface options.
 * Clean up the logfile/syslog setup.
 * [Bug 970] Lose obsolete -g flag to ntp-keygen.
 * The -e flag to ntp-keygen can write GQ keys now, too.
diff --git a/libisc/net.c b/libisc/net.c
index 19ef684bc..3d4ab66e7 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) {