[master] Squashed commit of the following:

4561.	[port]		Silence a warning in strict C99 compilers. [RT #44414]
This commit is contained in:
Evan Hunt 2017-02-01 17:31:11 -08:00
parent caf7f57771
commit 6cb5e36ca3
2 changed files with 6 additions and 4 deletions

View file

@ -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]

View file

@ -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;