Fix missing parenthesis and remove duplicate CONFIG_CDELAY

bk: 41eca346d_eor_rC405A7ZwQPC1N_w

diff --git a/include/ntp_config.h b/include/ntp_config.h
index 69e6d46a661f06cd1f46f55381134c2ba4463bc0..c0d34f92a2fd4f759cd46cea3f4e78eb8d2d4dca 100644 (file)
--- a/include/ntp_config.h
+++ b/include/ntp_config.h
@@ -56,9 +56,8 @@
 #define CONFIG_TTL             35
 #define CONFIG_INCLUDEFILE      36
 #define CONFIG_KEYSDIR         37
-#define CONFIG_CDELAY          38
 #ifdef OPENSSL
-#define CONFIG_CRYPTO          39
+#define CONFIG_CRYPTO          38
 #endif /* OPENSSL */
 
 /*

diff --git a/ports/winnt/include/isc/ipv6.h b/ports/winnt/include/isc/ipv6.h
index c8c76e6d98618ec0b2db600f6dd2998c3fd25d32..828ca762e57a7c813a5e3b399e99b34112ddbf22 100644 (file)
--- a/ports/winnt/include/isc/ipv6.h
+++ b/ports/winnt/include/isc/ipv6.h
@@ -62,7 +62,7 @@ extern const struct in6_addr isc_in6addr_loopback;
  */
 
 #ifndef IN6_IS_ADDR_UNSPECIFIED
-#define IN6_IS_ADDR_UNSPECIFIED(a)      \
+#define IN6_IS_ADDR_UNSPECIFIED(a)     (\
 *((u_long *)((a)->s6_addr)    ) == 0 && \
 *((u_long *)((a)->s6_addr) + 1) == 0 && \
 *((u_long *)((a)->s6_addr) + 2) == 0 && \