From: Evan Hunt <each@isc.org>
Date: Tue, 2 May 2017 17:58:41 +0000 (-0700)
Subject: [master] fix win32 build errors
X-Git-Tag: v9.12.0a1~319
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c97cb13bdcc1f11ee75ae84068e2a8e59200430;p=thirdparty%2Fbind9.git

[master] fix win32 build errors
---

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 2b21e66833d..6cba4085698 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -1597,7 +1597,7 @@ update_newheader(rdatasetheader_t *new, rdatasetheader_t *old) {
 		new->node = (dns_rbtnode_t *)p;
 	}
 	if (CASESET(old)) {
-		uint16_t attr;
+		isc_uint16_t attr;
 
 		memmove(new->upper, old->upper, sizeof(old->upper));
 		attr = old->attributes & (RDATASET_ATTR_CASESET |
@@ -9697,12 +9697,11 @@ free_gluetable(rbtdb_version_t *version) {
 
 static isc_boolean_t
 rehash_gluetable(rbtdb_version_t *version) {
-	size_t oldsize;
+	size_t oldsize, i;
 	rbtdb_glue_table_node_t **oldtable;
 	rbtdb_glue_table_node_t *gluenode;
 	rbtdb_glue_table_node_t *nextgluenode;
-	uint32_t hash;
-	size_t i;
+	isc_uint32_t hash;
 
 	if (ISC_LIKELY(version->glue_table_nodecount <
 		       (version->glue_table_size * 3U)))
diff --git a/lib/dns/view.c b/lib/dns/view.c
index 43386309bce..918d2492a4b 100644
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -1995,6 +1995,11 @@ dns_view_untrust(dns_view_t *view, const dns_name_t *keyname,
  * a new path is created; returns ISC_R_NOSPACE if the path won't
  * fit in 'buflen'.
  */
+
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
+
 static isc_result_t
 nz_legacy(const char *directory, const char *viewname,
 	  const char *suffix, char *buffer, size_t buflen)