[v9_9] address portability issues

(cherry picked from commit a2bd99a959bf84c48a5f5f71df7a2212a86db670)

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 362337b9e33b5d573c7c541daed6e1a1a38e7d43..c3f714c1425d0afe23bbd4d082f6cb3f8741bf46 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -5823,7 +5823,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;
@@ -5855,7 +5855,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 0a7bf823c97dff4e3bacc6ed26836e239b7bd958..c96e89472f8c2664b23907d32fddc0c55bbf7a22 100644 (file)
--- a/lib/isc/include/isc/event.h
+++ b/lib/isc/include/isc/event.h
@@ -42,7 +42,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