From: Dave Hart <hart@ntp.org>
Date: Thu, 27 Aug 2009 20:02:26 +0000 (+0000)
Subject: [Bug 1292] Minor Windows source tweaks for VC6-era SDK headers.
X-Git-Tag: NTP_4_2_5P207~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=293a3708fd673fcb30834a4d86868d237f045006;p=thirdparty%2Fntp.git

[Bug 1292] Minor Windows source tweaks for VC6-era SDK headers.
  From Martin Burnicki

bk: 4a96e652DKvrUHDEtDbNqKvZz-mtFg
---

diff --git a/ChangeLog b/ChangeLog
index aebcf9be1..447da4c52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1292] Minor Windows source tweaks for VC6-era SDK headers.
 (4.2.5p206) 2009/08/26 Released by Harlan Stenn <stenn@ntp.org>
 * accopt.html typo fixes from Dave Mills.
 * [Bug 1283] default to remembering KoD in sntp.
diff --git a/ports/winnt/include/config.h b/ports/winnt/include/config.h
index 7108cfc0a..60b2676a4 100644
--- a/ports/winnt/include/config.h
+++ b/ports/winnt/include/config.h
@@ -32,6 +32,7 @@
 #if defined(_MSC_VER) && defined(_DEBUG)
 #define _CRTDBG_MAP_ALLOC
 #include <stdlib.h>
+#include <malloc.h>
 #include <crtdbg.h>
 /* #define MALLOC_LINT */	/* defers free() */
 #endif
@@ -141,10 +142,11 @@ extern int tty_open(char *, int, int);
 #define ISC_PLATFORM_HAVEIPV6
 #define ISC_PLATFORM_HAVESCOPEID
 #define HAVE_STRUCT_SOCKADDR_STORAGE
-#define ISC_PLATFORM_HAVEIN6PKTINFO
 #define NO_OPTION_NAME_WARNINGS
 #endif	/* in_addr6 / RFC2553-compliant IPv6 headers */
 
+#define ISC_PLATFORM_HAVEIN6PKTINFO
+
 #if !defined( _W64 )
   /*
    * if ULONG_PTR needs to be defined then the build environment
diff --git a/ports/winnt/libisc/interfaceiter.c b/ports/winnt/libisc/interfaceiter.c
index dbd9e69f1..d7225cb7b 100644
--- a/ports/winnt/libisc/interfaceiter.c
+++ b/ports/winnt/libisc/interfaceiter.c
@@ -91,7 +91,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);