2 files changed, 3 insertions, 3 deletions
diff --git a/src/daemontools-extras/s6-log.c b/src/daemontools-extras/s6-log.c
index bdc0a82..c57e6d7 100644
--- a/src/daemontools-extras/s6-log.c
+++ b/src/daemontools-extras/s6-log.c
@@ -567,7 +567,7 @@ static inline void logdir_init (unsigned int index, uint32_t s, uint32_t n, uint
 {
   logdir_t *ldp = logdirs + index ;
   struct stat st ;
-  size_t dirlen = str_len(name) ;
+  size_t dirlen = strlen(name) ;
   int r ;
   char x[dirlen + 11] ;
   ldp->s = s ;
diff --git a/src/daemontools-extras/s6-softlimit.c b/src/daemontools-extras/s6-softlimit.c
index 7de9f3d..d3fbaee 100644
--- a/src/daemontools-extras/s6-softlimit.c
+++ b/src/daemontools-extras/s6-softlimit.c
@@ -16,9 +16,9 @@ static void doit (int res, char const *arg)
   if ((arg[0] == '=') && !arg[1]) r.rlim_cur = r.rlim_max ;
   else
   {
-    uint64 n ;
+    uint64_t n ;
     if (!uint640_scan(arg, &n)) strerr_dieusage(100, USAGE) ;
-    if (n > (uint64)r.rlim_max) n = (uint64)r.rlim_max ;
+    if (n > (uint64_t)r.rlim_max) n = (uint64_t)r.rlim_max ;
     r.rlim_cur = (rlim_t)n ;
   }
   if (setrlimit(res, &r) < 0) strerr_diefu1sys(111, "setrlimit") ;