[ntpsec commit] Reove unused constants and guard symbols.

Eric S. Raymond esr at ntpsec.org
Sat Oct 3 14:45:41 UTC 2015


Module:    ntpsec
Branch:    master
Commit:    0c5588f06ed300b2d497b3f013b3621e8dfc9dc0
Changeset: http://git.ntpsec.org/ntpsec/commit/?id=0c5588f06ed300b2d497b3f013b3621e8dfc9dc0

Author:    Eric S. Raymond <esr at thyrsus.com>
Date:      Sat Oct  3 10:45:00 2015 -0400

Reove unused constants and guard symbols.

---

 lib/isc/unix/net.c               | 8 --------
 lib/isc/win32/include/isc/ipv6.h | 4 ----
 lib/isc/win32/include/isc/net.h  | 5 -----
 lib/isc/win32/net.c              | 9 ---------
 pylib/configure.py               | 6 ++++++
 5 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/lib/isc/unix/net.c b/lib/isc/unix/net.c
index 8c4b765..dc31c3b 100644
--- a/lib/isc/unix/net.c
+++ b/lib/isc/unix/net.c
@@ -90,16 +90,8 @@
 
 #endif /* HAVE_SYSCTLBYNAME */
 
-#if defined(ISC_PLATFORM_NEEDIN6ADDRANY)
-const struct in6_addr isc_net_in6addrany = IN6ADDR_ANY_INIT;
-#endif
-
 #if defined(ISC_PLATFORM_HAVEIPV6)
 
-# if defined(ISC_PLATFORM_NEEDIN6ADDRLOOPBACK)
-const struct in6_addr isc_net_in6addrloop = IN6ADDR_LOOPBACK_INIT;
-# endif
-
 # if defined(ENABLE_IPV6)
 static isc_once_t 	once_ipv6only = ISC_ONCE_INIT;
 # endif
diff --git a/lib/isc/win32/include/isc/ipv6.h b/lib/isc/win32/include/isc/ipv6.h
index ef24b7e..2f78346 100644
--- a/lib/isc/win32/include/isc/ipv6.h
+++ b/lib/isc/win32/include/isc/ipv6.h
@@ -45,8 +45,4 @@
 #define in6_addr in_addr6
 #endif
 
-
-LIBISC_EXTERNAL_DATA extern const struct in6_addr isc_net_in6addrany;
-LIBISC_EXTERNAL_DATA extern const struct in6_addr isc_net_in6addrloop;
-
 #endif /* GUARD_ISC_IPV6_H */
diff --git a/lib/isc/win32/include/isc/net.h b/lib/isc/win32/include/isc/net.h
index 76f86a1..e4740da 100644
--- a/lib/isc/win32/include/isc/net.h
+++ b/lib/isc/win32/include/isc/net.h
@@ -112,11 +112,6 @@ struct in6_pktinfo {
 };
 #endif
 
-#if _MSC_VER < 1300
-#define in6addr_any isc_net_in6addrany
-#define in6addr_loopback isc_net_in6addrloop
-#endif
-
 #define ISC__IPADDR(x)	((isc_uint32_t)htonl((isc_uint32_t)(x)))
 
 #define ISC_IPADDR_ISMULTICAST(i) \
diff --git a/lib/isc/win32/net.c b/lib/isc/win32/net.c
index 7586671..71d9e80 100644
--- a/lib/isc/win32/net.c
+++ b/lib/isc/win32/net.c
@@ -46,15 +46,6 @@
 #define ISC_NET_PORTRANGEHIGH 65535
 #endif	/* ISC_NET_PORTRANGEHIGH */
 
-#if defined(ISC_PLATFORM_NEEDIN6ADDRANY)
-const struct in6_addr isc_net_in6addrany = IN6ADDR_ANY_INIT;
-#endif
-
-#if defined(ISC_PLATFORM_NEEDIN6ADDRLOOPBACK)
-const struct in6_addr isc_net_in6addrloop = IN6ADDR_LOOPBACK_INIT;
-#endif
-
-
 static isc_once_t 	once = ISC_ONCE_INIT;
 static isc_once_t 	once_ipv6only = ISC_ONCE_INIT;
 static isc_once_t 	once_ipv6pktinfo = ISC_ONCE_INIT;
diff --git a/pylib/configure.py b/pylib/configure.py
index 933da64..245c6d0 100644
--- a/pylib/configure.py
+++ b/pylib/configure.py
@@ -308,6 +308,12 @@ def cmd_configure(ctx):
 		ctx.define("ISC_PLATFORM_HAVEIPV6", 1)
 		ctx.define("ISC_PLATFORM_HAVEIN6PKTINFO", 1)
 
+	# NetBSD (used to) need to recreate sockets on changed routing.
+	# Perhaps it still does. If so, this should be set.  The autoconf
+	# build set it "if the OS clears cached routes when more specifics
+	# become available".
+	# ctx.define("OS_MISSES_SPECIFIC_ROUTE_UPDATES", 1)
+
 	if ctx.options.enable_leap_smear:
 		ctx.define("ENABLE_LEAP_SMEAR", 1)
 



More information about the vc mailing list