[ntp:bk-ntp-dev-send] BitKeeper diffs

Harlan Stenn stenn at deacon.udel.edu
Thu Apr 28 06:11:37 UTC 2011


#### ChangeSet ####
2011-04-28 00:05:49-04:00, murray at pogo.udel.edu
  ntp_io.c:
    Fix unused variable warning (no IPv6)
  ntp_control.c:
    Fix unused variable warning (no REFCLOCKs)
  ChangeLog:
    Fix unused variable warnings.

==== ChangeLog ====
2011-04-28 00:05:07-04:00, murray at pogo.udel.edu +1 -0
  Fix unused variable warnings.

--- 1.861.1.2/ChangeLog	2011-04-24 03:38:47 -04:00
+++ 1.861.1.3/ChangeLog	2011-04-28 00:05:07 -04:00
@@ -1,3 +1,4 @@
+* Fix a couple of unused variable warnings.
 (4.2.7p158) 2011/04/24 Released by Harlan Stenn <stenn at ntp.org>
 * Update libevent --disable-libevent-regress handling to work when
   building libevent using mingw.

==== ntpd/ntp_control.c ====
2011-04-28 00:04:55-04:00, murray at pogo.udel.edu +2 -0
  Fix unused variable warning (no REFCLOCKs)

--- 1.167/ntpd/ntp_control.c	2011-04-07 22:02:46 -04:00
+++ 1.168/ntpd/ntp_control.c	2011-04-28 00:04:55 -04:00
@@ -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 */
 
 
 /*

==== ntpd/ntp_io.c ====
2011-04-28 00:04:28-04:00, murray at pogo.udel.edu +4 -1
  Fix unused variable warning (no IPv6)

--- 1.352/ntpd/ntp_io.c	2011-04-11 17:24:10 -04:00
+++ 1.353/ntpd/ntp_io.c	2011-04-28 00:04:28 -04:00
@@ -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;


More information about the bk-ntp-dev-send mailing list