[v9_11] Squashed commit of the following:

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

(cherry picked from commit 6cb5e36ca3bbcbfd5ebbb0edc0db52855575d637)

diff --git a/CHANGES b/CHANGES
index a0df0f41594f98b0fdabcb420b6d75fc2fb42773..7611fdb11a6cfa3781ecbececf4cb10fdf2458c5 100644 (file)
--- 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 85a835575753dc6ff1f56d0700d875ed66acd1b2..4a331b09f94452d10afe8bbd29cc4f8e6599cac5 100644 (file)
--- 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;