commit 31fbbf2377846535848553938f6be233f3092702 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 17 12:45:53 2018 -0400

Fixup timing wheel warnings related to recent WHEEL_BIT change. --- src/ext/timeouts/timeout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ext/timeouts/timeout.c b/src/ext/timeouts/timeout.c index 713ec219c..d4b514d2c 100644 --- a/src/ext/timeouts/timeout.c +++ b/src/ext/timeouts/timeout.c @@ -150,7 +150,7 @@ #else #define ctz(n) ctz32(n) #define clz(n) clz32(n) -#define fls(n) ((int)(32 - clz32(n))) +#define fls(n) ((int)(32 - clz32((uint32_t)n))) #endif

#if WHEEL_BIT == 6 @@ -432,7 +432,7 @@ TIMEOUT_PUBLIC void timeouts_update(struct timeouts *T, abstime_t curtime) { * or can be replaced with a simpler operation. */ oslot = WHEEL_MASK & (T->curtime >> (wheel * WHEEL_BIT)); - pending = rotl(((UINT64_C(1) << _elapsed) - 1), oslot); + pending = rotl(((WHEEL_C(1) << _elapsed) - 1), oslot);

nslot = WHEEL_MASK & (curtime >> (wheel * WHEEL_BIT)); pending |= rotr(rotl(((WHEEL_C(1) << _elapsed) - 1), nslot), (int)_elapsed);