Merge commit 'acbdc29d' into thread-merge-2.16

diff --cc lib/timer.c
index 371c18bd0983b8c82d360202cd170f891f86da4a,92da5061d6de9a56c131404ae460ee37e68671fa..1d727e6cf1bdc9611e1b7689aae2dc0587523b9a
--- 1/lib/timer.c
--- 2/lib/timer.c
+++ b/lib/timer.c
@@@ -68,9 -110,9 +68,9 @@@ tm_dump(resource *r, unsigned indent UN
    if (t->randomize)
      debug("rand %d, ", t->randomize);
    if (t->recurrent)
-     debug("recur %d, ", t->recurrent);
+     debug("recur %ld, ", t->recurrent);
    if (t->expires)
-     debug("in loop %p expires in %d ms)\n", t->loop, (t->expires - current_time()) TO_MS);
 -    debug("expires in %ld ms)\n", (t->expires - current_time()) TO_MS);
++    debug("in loop %p expires in %ld ms)\n", t->loop, (t->expires - current_time()) TO_MS);
    else
      debug("inactive)\n");
  }

diff --cc lib/timer.h
index 7cdc5768cdd0c053efcc2f0d574bf8642c1dd00e,83ce34aaf446947c4dfc94be155cbe791ad14603..f52694c8966cbcddfdd6f2f8c281e827ccabfd3a
--- 1/lib/timer.h
--- 2/lib/timer.h
+++ b/lib/timer.h
@@@ -28,11 -22,9 +28,11 @@@ typedef struct time
    void *data;
  
    btime expires;                      /* 0=inactive */
+   btime recurrent;                    /* Timer recurrence */
    uint randomize;                     /* Amount of randomization */
-   uint recurrent;                     /* Timer recurrence */
  
 +  struct timeloop *loop;              /* Loop where the timer is active */
 +
    int index;
  } timer;
  

diff --cc sysdep/unix/io.c
Simple merge