[master] fix win32 build errors

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 2b21e66833d88ec436cd278336d43b90cf485da2..6cba408569846d34034d0ddc49f11374f9c58711 100644 (file)
--- 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 43386309bce16c040332ff46ea4a2c661a4352af..918d2492a4bb3da8d2b89891f38eb5bd305e12f9 100644 (file)
--- 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)