From: Maria Matejka <mq@ucw.cz>
Date: Thu, 28 Nov 2024 11:18:44 +0000 (+0100)
Subject: Merge commit 'acbdc29d' into thread-merge-2.16
X-Git-Tag: v3.0.0~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4bd40679535c8ee89a6523cf3eebacfc1194492;p=thirdparty%2Fbird.git

Merge commit 'acbdc29d' into thread-merge-2.16
---

b4bd40679535c8ee89a6523cf3eebacfc1194492
diff --cc lib/timer.c
index 371c18bd0,92da5061d..1d727e6cf
--- a/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 7cdc5768c,83ce34aaf..f52694c89
--- a/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;