From 0fdcf394cb0b0fa60a7da9f852478ec20486550b Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Fri, 17 Apr 2015 15:32:05 -0700
Subject: [PATCH] [v9_10] misc x64 VS 2015 CTP fixes [#39308]

(cherry picked from commit ab973ec40cc7a79bbf930085b1293824caf73e7f)
---
 CHANGES              | 3 +++
 bin/named/client.c   | 2 --
 bin/named/win32/os.c | 2 --
 lib/dns/rdata.c      | 2 +-
 lib/dns/view.c       | 2 --
 lib/isc/entropy.c    | 5 +++++
 lib/isccc/cc.c       | 4 ++--
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index f0145cb4ed..90cf23fc03 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4105.	[port]		Misc fixes for Microsoft Visual Studio
+			2015 CTP6 in 64 bit mode. [RT #39308]
+
 4104.	[bug]		Address uninitialized elements. [RT #39252]
 
 4102.	[bug]		Fix a use after free bug introduced in change
diff --git a/bin/named/client.c b/bin/named/client.c
index ac7409f531..eebd04b277 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.286 2012/01/31 23:47:30 tbox Exp $ */
-
 #include <config.h>
 
 #include <isc/formatcheck.h>
diff --git a/bin/named/win32/os.c b/bin/named/win32/os.c
index 2488af5464..91e29d97b4 100644
--- a/bin/named/win32/os.c
+++ b/bin/named/win32/os.c
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.39 2012/02/06 23:46:44 tbox Exp $ */
-
 #include <config.h>
 #include <stdarg.h>
 
diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index 10017dc0b5..66536fcdd0 100644
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -1399,7 +1399,7 @@ multitxt_fromtext(isc_textregion_t *source, isc_buffer_t *target) {
 		if (escape)
 			return (DNS_R_SYNTAX);
 
-		isc_buffer_add(target, t - t0);
+		isc_buffer_add(target, (unsigned int)(t - t0));
 	} while (n != 0);
 	return (ISC_R_SUCCESS);
 }
diff --git a/lib/dns/view.c b/lib/dns/view.c
index f86d1c70e4..3befe14b22 100644
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id$ */
-
 /*! \file */
 
 #include <config.h>
diff --git a/lib/isc/entropy.c b/lib/isc/entropy.c
index 389038637b..ffdd88f196 100644
--- a/lib/isc/entropy.c
+++ b/lib/isc/entropy.c
@@ -319,7 +319,12 @@ entropypool_adddata(isc_entropy_t *ent, void *p, unsigned int len,
 	unsigned long addr;
 	isc_uint8_t *buf;
 
+	/* Silly MSVC in 64 bit mode complains here... */
+#ifdef _WIN64
+	addr = (unsigned long)((unsigned long long)p);
+#else
 	addr = (unsigned long)p;
+#endif
 	buf = p;
 
 	if ((addr & 0x03U) != 0U) {
diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c
index 43e309436e..0bffcafeff 100644
--- a/lib/isccc/cc.c
+++ b/lib/isccc/cc.c
@@ -189,7 +189,7 @@ table_towire(isccc_sexpr_t *alist, isccc_region_t *target)
 	isccc_sexpr_t *kv, *elt, *k, *v;
 	char *ks;
 	isc_result_t result;
-	size_t len;
+	unsigned int len;
 
 	for (elt = isccc_alist_first(alist);
 	     elt != NULL;
@@ -198,7 +198,7 @@ table_towire(isccc_sexpr_t *alist, isccc_region_t *target)
 		k = ISCCC_SEXPR_CAR(kv);
 		ks = isccc_sexpr_tostring(k);
 		v = ISCCC_SEXPR_CDR(kv);
-		len = strlen(ks);
+		len = (unsigned int)strlen(ks);
 		INSIST(len <= 255U);
 		/*
 		 * Emit the key name.