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

This commit is contained in:
Evan Hunt
2018-01-24 10:59:57 -08:00
parent b06c187525
commit f6ea3eaf82
3 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -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;
+1 -1
View File
@@ -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 |
+1 -1
View File
@@ -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',