From: Evan Hunt <each@isc.org>
Date: Wed, 24 Jan 2018 18:59:57 +0000 (-0800)
Subject: [v9_11] change uint to isc_uint to fix build failure on windows
X-Git-Tag: v9.11.3b1~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6ea3eaf82dfafc4cd3d4a3449fe74ac797b469b;p=thirdparty%2Fbind9.git

[v9_11] change uint to isc_uint to fix build failure on windows
---

diff --git a/lib/dns/dnstap.c b/lib/dns/dnstap.c
index 11a97b80ec0..495f53c0948 100644
--- a/lib/dns/dnstap.c
+++ b/lib/dns/dnstap.c
@@ -656,7 +656,7 @@ setaddr(dns_dtmsg_t *dm, isc_sockaddr_t *sa, isc_boolean_t tcp,
 		*port = ntohs(sa->type.sin6.sin6_port);
 	} else {
 		dm->m.socket_family = DNSTAP__SOCKET_FAMILY__INET;
-		addr->data = (uint8_t *) &sa->type.sin.sin_addr.s_addr;
+		addr->data = (isc_uint8_t *) &sa->type.sin.sin_addr.s_addr;
 		addr->len = 4;
 		*port = ntohs(sa->type.sin.sin_port);
 	}
@@ -812,7 +812,7 @@ static isc_boolean_t
 dnstap_file(struct fstrm_reader *r) {
 	fstrm_res res;
 	const struct fstrm_control *control = NULL;
-	const uint8_t *rtype = NULL;
+	const isc_uint8_t *rtype = NULL;
 	size_t dlen = strlen(DNSTAP_CONTENT_TYPE), rlen = 0;
 	size_t n = 0;
 
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 1339c01efe0..689f6b4d027 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -1675,7 +1675,7 @@ update_newheader(rdatasetheader_t *newh, rdatasetheader_t *old) {
 		newh->node = (dns_rbtnode_t *)p;
 	}
 	if (CASESET(old)) {
-		uint16_t attr;
+		isc_uint16_t attr;
 
 		memmove(newh->upper, old->upper, sizeof(old->upper));
 		attr = old->attributes & (RDATASET_ATTR_CASESET |
diff --git a/lib/dns/tests/name_test.c b/lib/dns/tests/name_test.c
index 1b46af40e3e..3800c151ee7 100644
--- a/lib/dns/tests/name_test.c
+++ b/lib/dns/tests/name_test.c
@@ -342,7 +342,7 @@ ATF_TC_HEAD(benchmark, tc) {
 static void *
 fromwire_thread(void *arg) {
 	unsigned int maxval = 32000000;
-	uint8_t data[] = {
+	isc_uint8_t data[] = {
 		3, 'w', 'w', 'w',
 		7, 'e', 'x', 'a', 'm', 'p', 'l', 'e',
 		7, 'i', 'n', 'v', 'a', 'l', 'i', 'd',