[master] address portability issues

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index eff5bf5dadf48768da44703759e9134d0554815e..8398a7d38de192e7de7afe34bc44fc76a812ef2c 100644 (file)
--- 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 f598c2d07db9934d1cf08fac087bc932b1e957df..f2003890272b6b89a5419e80172b97df89386485 100644 (file)
--- 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