From 495d625add9e52b29a98c4fa2627a45d20d44849 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Wed, 8 Mar 2017 12:17:31 +0000
Subject:  Make it build with skalibs-2.5.0.0

---
 src/minutils/s6-logwatch.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/minutils/s6-logwatch.c')

diff --git a/src/minutils/s6-logwatch.c b/src/minutils/s6-logwatch.c
index 66ff442..d522b5e 100644
--- a/src/minutils/s6-logwatch.c
+++ b/src/minutils/s6-logwatch.c
@@ -1,6 +1,7 @@
 /* ISC license. */
 
 #include <sys/types.h>
+#include <sys/uio.h>
 #include <errno.h>
 #include <unistd.h>
 #include <signal.h>
@@ -14,10 +15,9 @@
 #include <skalibs/buffer.h>
 #include <skalibs/bufalloc.h>
 #include <skalibs/sig.h>
-#include <skalibs/siovec.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/iopause.h>
-#include <skalibs/ulong.h>
+#include <skalibs/types.h>
 
 #define USAGE "s6-logwatch [ -m maxbuffer ] logdir"
 #define dieusage() strerr_dieusage(100, USAGE)
@@ -40,8 +40,8 @@ static void X (void)
 static size_t nbcat (int fdcurrent)
 {
   char buf[N+1] ;
-  buffer b = BUFFER_INIT(&buffer_read, fdcurrent, buf, N+1) ;
-  siovec_t v[2] ;
+  buffer b = BUFFER_INIT(&fd_readv, fdcurrent, buf, N+1) ;
+  struct iovec v[2] ;
   size_t bytes = 0 ;
   for (;;)
   {
@@ -71,7 +71,7 @@ int main (int argc, char const *const *argv)
     subgetopt_t l = SUBGETOPT_ZERO ;
     for (;;)
     {
-      register int opt = subgetopt_r(argc, argv, "m:", &l) ;
+      int opt = subgetopt_r(argc, argv, "m:", &l) ;
       if (opt == -1) break ;
       switch (opt)
       {
-- 
cgit v1.3.1