3 files changed, 4 insertions, 4 deletions
diff --git a/src/skadns/skadns_send.c b/src/skadns/skadns_send.c
index 7ee04c7..f8152b7 100644
--- a/src/skadns/skadns_send.c
+++ b/src/skadns/skadns_send.c
@@ -18,7 +18,7 @@ int skadns_send (skadns_t *a, uint16 *u, s6dns_domain_t const *d, uint16 qtype,
   unsigned int i ;
   char tmp[17] = "--Q" ;
   char err ;
-  siovec_t v[2] = { { .s = tmp, .len = 17 }, { .s = d->s, .len = d->len } } ;
+  siovec_t v[2] = { { .s = tmp, .len = 17 }, { .s = (char *)d->s, .len = d->len } } ;
   if (!gensetdyn_new(&a->q, &i)) return 0 ;
   uint16_pack_big(tmp, (uint16)i) ;
   uint16_pack_big(tmp + 3, qtype) ;
diff --git a/src/skadns/skadns_update.c b/src/skadns/skadns_update.c
index 50f3611..3a86b57 100644
--- a/src/skadns/skadns_update.c
+++ b/src/skadns/skadns_update.c
@@ -9,7 +9,7 @@
 #include <skalibs/gensetdyn.h>
 #include <skalibs/unixmessage.h>
 #include <skalibs/skaclient.h>
-#include <s6/skadns.h>
+#include <s6-dns/skadns.h>
 
 static int msghandler (unixmessage_t const *m, void *context)
 {
diff --git a/src/skadns/skadnsd.c b/src/skadns/skadnsd.c
index 7b5419f..473ed1a 100644
--- a/src/skadns/skadnsd.c
+++ b/src/skadns/skadnsd.c
@@ -37,7 +37,7 @@ static void remove (unsigned int i)
 static void fail (unsigned int i)
 {
   char pack[3] ;
-  unixmessage_t m = { .s = pack, len = 3, .fds = 0, .nfds = 0 } ;
+  unixmessage_t m = { .s = pack, .len = 3, .fds = 0, .nfds = 0 } ;
   uint16_pack_big(pack, a[i].id) ;
   pack[2] = a[i].dt.status ;
   s6dns_engine_recycle(&a[i].dt) ;
@@ -178,7 +178,7 @@ int main (void)
           unixmessage_v_t mv = { .v = v, .vlen = 2, .fds = 0, .nfds = 0 } ;
           uint16_pack_big(pack, a[i].id) ;
           pack[2] = 0 ;
-          if (!unixmessage_putv(unixmessage_sender_x, v, 2))
+          if (!unixmessage_putv(unixmessage_sender_x, &mv))
             strerr_diefu1sys(111, "unixmessage_put") ;
           s6dns_engine_recycle(&a[i].dt) ;
           remove(i--) ;