commit 10fd4535c2109c9532585aca2c429f741937364c Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 14 20:13:34 2016 -0400
Fix an OSX/clang compilation warning --- 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 dbc24fa..f528576 100644 --- a/src/ext/timeouts/timeout.c +++ b/src/ext/timeouts/timeout.c @@ -300,7 +300,7 @@ TIMEOUT_PUBLIC void timeouts_del(struct timeouts *T, struct timeout *to) {
if (to->pending != &T->expired && TAILQ_EMPTY(to->pending)) { ptrdiff_t index = to->pending - &T->wheel[0][0]; - int wheel = index / WHEEL_LEN; + int wheel = (int) (index / WHEEL_LEN); int slot = index % WHEEL_LEN;
T->pending[wheel] &= ~(WHEEL_C(1) << slot); @@ -435,7 +435,7 @@ TIMEOUT_PUBLIC void timeouts_update(struct timeouts *T, abstime_t curtime) { pending = rotl(((UINT64_C(1) << _elapsed) - 1), oslot);
nslot = WHEEL_MASK & (curtime >> (wheel * WHEEL_BIT)); - pending |= rotr(rotl(((WHEEL_C(1) << _elapsed) - 1), nslot), _elapsed); + pending |= rotr(rotl(((WHEEL_C(1) << _elapsed) - 1), nslot), (int)_elapsed); pending |= WHEEL_C(1) << nslot; }