[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 11a97b80ec09a8ac6e36d5fc71c608d040d898ac..495f53c0948c6dbc89d24e2a07744326e7cf8cab 100644 (file)
--- 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 1339c01efe054ebb462a446ab67a77122f89a56e..689f6b4d027164ffb321215d0ba44a176d03023e 100644 (file)
--- 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 1b46af40e3e6bfd02c7fb749630cdd3bc098e860..3800c151ee7451b17cc8b55fb3fcdc92290d5430 100644 (file)
--- 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',