Fixes for bugs 1448-1450

bk: 4b3ed05fWV4irQh_HcEYRJ1WgB2uRw

diff --git a/ChangeLog b/ChangeLog
index a7f7d354ce7fe5cc2abbe5375d52267248631132..c20660184a480a7253dc46c1bd438202f0757f25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+* [Bug 1448] Some macros not correctly conditionally or absolutely defined
+  on Windows
+* [Bug 1449] ntpsim.h should be conditionally in ntp_config.c
+* [Bug 1450] Option to exclude warnings not unconditionally defined on Windows
 ---
 
 * [Bug 1445] IRIX does not have -lcap or support linux capabilities.

diff --git a/lib/isc/netaddr.c b/lib/isc/netaddr.c
index 85dd53e03eb6b883ccfe73213910ca8882bd9a9c..cfd4991dfc80e3611afa173f6bf4e8d5d1129c3a 100644 (file)
--- a/lib/isc/netaddr.c
+++ b/lib/isc/netaddr.c
@@ -371,7 +371,7 @@ void
 isc_netaddr_any6(isc_netaddr_t *netaddr) {
        memset(netaddr, 0, sizeof(*netaddr));
        netaddr->family = AF_INET6;
-       netaddr->type.in6 = in6addr_any;
+/*     netaddr->type.in6 = in6addr_any; Not strictly necessary */
 }
 
 isc_boolean_t

diff --git a/lib/isc/win32/include/isc/platform.h b/lib/isc/win32/include/isc/platform.h
index 7faf7743bb36966eb1e633d4c2f6727208bf0899..d74fc76b05986181512ec8a0becfebc9751dbf19 100644 (file)
--- a/lib/isc/win32/include/isc/platform.h
+++ b/lib/isc/win32/include/isc/platform.h
@@ -30,11 +30,11 @@
  *** Network.
  ***/
 
-#define ISC_PLATFORM_HAVEIPV6
 #if _MSC_VER > 1200
+#define ISC_PLATFORM_HAVEIPV6
 #define ISC_PLATFORM_HAVEIN6PKTINFO
-#endif
 #define ISC_PLATFORM_HAVESCOPEID
+#endif
 #define ISC_PLATFORM_NEEDPORTT
 #undef MSG_TRUNC
 #define ISC_PLATFORM_NEEDNTOP

diff --git a/lib/isc/win32/interfaceiter.c b/lib/isc/win32/interfaceiter.c
index b71cb245abcc011123b61a38b80e80b6fc2e79cb..903fa213d334eecdcb3d36cd27511aa564f4ce1e 100644 (file)
--- a/lib/isc/win32/interfaceiter.c
+++ b/lib/isc/win32/interfaceiter.c
@@ -98,7 +98,9 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src) {
                memcpy(&dst->type.in6,
                       &((struct sockaddr_in6 *) src)->sin6_addr,
                       sizeof(struct in6_addr));
+#ifdef ISC_PLATFORM_HAVESCOPEID
                dst->zone = ((struct sockaddr_in6 *) src)->sin6_scope_id;
+#endif
                break;
        default:
                INSIST(0);

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index 9426e0a0fa5d0615b76acae2b8619f94043dab2f..ff616ea3a4b12c207fe19c10e7c221a3d38f4f9d 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -25,8 +25,10 @@
 #include "ntp_filegen.h"
 #include "ntp_stdlib.h"
 #include "ntp_assert.h"
-#include "ntpsim.h"
 #include "ntpd-opts.h"
+#ifdef SIM
+#include "ntpsim.h"
+#endif
 #include <ntp_random.h>
 #include "ntp_intres.h"
 #include <isc/net.h>

diff --git a/ports/winnt/include/config.h b/ports/winnt/include/config.h
index d67968b3b998f42bf66465040136da8365cb1f71..0a05788a8767d9bd3d80c8017da468f1e33329a7 100644 (file)
--- a/ports/winnt/include/config.h
+++ b/ports/winnt/include/config.h
@@ -140,10 +140,10 @@ extern int tty_open(char *, int, int);
 #define ISC_PLATFORM_HAVEIPV6
 #define ISC_PLATFORM_HAVESCOPEID
 #define HAVE_STRUCT_SOCKADDR_STORAGE
-#define NO_OPTION_NAME_WARNINGS
+#define ISC_PLATFORM_HAVEIN6PKTINFO
 #endif /* in_addr6 / RFC2553-compliant IPv6 headers */
 
-#define ISC_PLATFORM_HAVEIN6PKTINFO
+#define NO_OPTION_NAME_WARNINGS
 
 #if !defined( _W64 )
   /*

diff --git a/ports/winnt/vc6/libntp.dsp b/ports/winnt/vc6/libntp.dsp
index 45bf21c7f8bb9e2d00c6634a58abee6d93c0635a..f209e179e1e25def6bffd15f13228621fced151e 100644 (file)
--- a/ports/winnt/vc6/libntp.dsp
+++ b/ports/winnt/vc6/libntp.dsp
@@ -390,10 +390,6 @@ SOURCE=..\..\..\libntp\statestr.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\..\lib\isc\win32\stdime.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\libntp\syslog.c\r
 # End Source File\r
 # Begin Source File\r