From: Evan Hunt <each@isc.org>
Date: Thu, 2 Feb 2017 01:31:11 +0000 (-0800)
Subject: [master] Squashed commit of the following:
X-Git-Tag: v9.12.0a1~494
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=6cb5e36ca3bbcbfd5ebbb0edc0db52855575d637;p=thirdparty%2Fbind9.git

[master] Squashed commit of the following:

4561.	[port]		Silence a warning in strict C99 compilers. [RT #44414]
---

diff --git a/CHANGES b/CHANGES
index 968961ab323..f6307b66d94 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+4561.	[port]		Silence a warning in strict C99 compilers. [RT #44414]
+
 4560.	[bug]		mdig: add -m option to enable memory debugging rather
 			than having it on all the time. [RT #44509]
 
diff --git a/lib/dns/include/dns/rrl.h b/lib/dns/include/dns/rrl.h
index cdfaa14f5dd..dd9b392f375 100644
--- a/lib/dns/include/dns/rrl.h
+++ b/lib/dns/include/dns/rrl.h
@@ -87,8 +87,8 @@ struct dns__rrl_key {
 	isc_uint32_t	    qname_hash;
 	dns_rdatatype_t	    qtype;
 	isc_uint8_t         qclass;
-	dns_rrl_rtype_t	    rtype   :4; /* 3 bits + sign bit */
-	isc_boolean_t	    ipv6    :1;
+	unsigned int	    rtype   :4; /* dns_rrl_rtype_t */
+	unsigned int	    ipv6    :1;
 };
 union dns_rrl_key {
 	struct dns__rrl_key s;
@@ -112,10 +112,10 @@ struct dns_rrl_entry {
 
 # define DNS_RRL_TS_GEN_BITS	2
 	unsigned int	ts_gen	    :DNS_RRL_TS_GEN_BITS;
-	isc_boolean_t	ts_valid    :1;
+	unsigned int	ts_valid    :1;
 # define DNS_RRL_HASH_GEN_BITS	1
 	unsigned int	hash_gen    :DNS_RRL_HASH_GEN_BITS;
-	isc_boolean_t	logged	    :1;
+	unsigned int	logged	    :1;
 # define DNS_RRL_LOG_BITS	11
 	unsigned int	log_secs    :DNS_RRL_LOG_BITS;