ntp_io.c:

  Fix unused variable warning (no IPv6)
ntp_control.c:
  Fix unused variable warning (no REFCLOCKs)
ChangeLog:
  Fix unused variable warnings.

bk: 4db8e79d8HZJLPYWZCBMXjd52Pyo3Q

diff --git a/ChangeLog b/ChangeLog
index dda441b7930f5549575442179f746e105d5c0d55..e5ce87b84c49345567d6e875d5ccca9bad37ba47 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Fix a couple of unused variable warnings.
 (4.2.7p158) 2011/04/24 Released by Harlan Stenn <stenn@ntp.org>
 * Update libevent --disable-libevent-regress handling to work when
   building libevent using mingw.

diff --git a/ntpd/ntp_control.c b/ntpd/ntp_control.c
index b58d0db2735ab1dfa3b630281c5e1ae7f9b37b2c..877989de4a4333f2164099ff2ee0acb1eac7b1c2 100644 (file)
--- a/ntpd/ntp_control.c
+++ b/ntpd/ntp_control.c
@@ -665,6 +665,7 @@ int num_ctl_traps;
  * the reference clock driver doesn't set peer->sstclktype to something
  * different than CTL_SST_TS_UNSPEC.
  */
+#ifdef REFCLOCK
 static u_char clocktypes[] = {
        CTL_SST_TS_NTP,         /* REFCLK_NONE (0) */
        CTL_SST_TS_LOCAL,       /* REFCLK_LOCALCLOCK (1) */
@@ -712,6 +713,7 @@ static u_char clocktypes[] = {
        CTL_SST_TS_UHF,         /* REFCLK_RIPENCC (43) */
        CTL_SST_TS_UHF,         /* REFCLK_NEOCLOCK4X (44) */
 };
+#endif  /* REFCLOCK */
 
 
 /*

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 689007f87cfa2b023ff94a68ff019f4b26e39aed..8aad2de20f9f03f09aa962e1c6f81ec401b700b3 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -1056,7 +1056,10 @@ create_wildcards(
        u_short port
        )
 {
-       int                     v4wild, v6wild;
+       int                     v4wild;
+#ifdef INCLUDE_IPV6_SUPPORT
+       int                     v6wild;
+#endif
        sockaddr_u              wildaddr;
        nic_rule_action         action;
        struct interface *      wildif;