From a2bd99a959bf84c48a5f5f71df7a2212a86db670 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Mon, 30 Jan 2017 16:52:18 -0800 Subject: [PATCH] [master] address portability issues --- lib/dns/resolver.c | 4 ++-- lib/isc/include/isc/event.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index eff5bf5dad..8398a7d38d 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -6199,7 +6199,7 @@ cname_target(dns_rdataset_t *rdataset, dns_name_t *tname) { * the DNAME RR and store it in 'target'. */ static inline isc_result_t -dname_target(dns_rdataset_t *rdataset, const dns_name_t *qname, +dname_target(dns_rdataset_t *rdataset, dns_name_t *qname, unsigned int nlabels, dns_name_t *target) { isc_result_t result; @@ -6231,7 +6231,7 @@ dname_target(dns_rdataset_t *rdataset, const dns_name_t *qname, * and 'rdataset'. */ static inline isc_result_t -fromdname(dns_rdataset_t *rdataset, const dns_name_t *lastcname, +fromdname(dns_rdataset_t *rdataset, dns_name_t *lastcname, unsigned int nlabels, const dns_name_t *qname) { dns_fixedname_t fixed; diff --git a/lib/isc/include/isc/event.h b/lib/isc/include/isc/event.h index f598c2d07d..f200389027 100644 --- a/lib/isc/include/isc/event.h +++ b/lib/isc/include/isc/event.h @@ -33,7 +33,7 @@ typedef void (*isc_eventdestructor_t)(isc_event_t *); isc_eventdestructor_t ev_destroy; \ void * ev_destroy_arg; \ ISC_LINK(ltype) ev_link; \ - ISC_LINK(ltype) ev_ratelink; + ISC_LINK(ltype) ev_ratelink /*% * Attributes matching a mask of 0x000000ff are reserved for the task library's