diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-07-28 10:22:10 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-07-28 10:22:10 -0400 |
| commit | 9fe6fea1cceb39fc415ad813020bbd863121e0c9 (patch) | |
| tree | 0437c4df402c6b7128d67e8c34d981bdd656b400 /src/ext | |
| parent | 0390e1a60cb91fa581ec568879bf300224db6322 (diff) | |
| download | tor-9fe6fea1cceb39fc415ad813020bbd863121e0c9.tar.gz tor-9fe6fea1cceb39fc415ad813020bbd863121e0c9.zip | |
Fix a huge pile of -Wshadow warnings.
These appeared on some of the Jenkins platforms. Apparently some
GCCs care when you shadow globals, and some don't.
Diffstat (limited to 'src/ext')
| -rw-r--r-- | src/ext/timeouts/timeout.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ext/timeouts/timeout.c b/src/ext/timeouts/timeout.c index bd463a700d..713ec219ce 100644 --- a/src/ext/timeouts/timeout.c +++ b/src/ext/timeouts/timeout.c @@ -299,9 +299,9 @@ TIMEOUT_PUBLIC void timeouts_del(struct timeouts *T, struct timeout *to) { TOR_TAILQ_REMOVE(to->pending, to, tqe); if (to->pending != &T->expired && TOR_TAILQ_EMPTY(to->pending)) { - ptrdiff_t index = to->pending - &T->wheel[0][0]; - int wheel = (int) (index / WHEEL_LEN); - int slot = index % WHEEL_LEN; + ptrdiff_t index_ = to->pending - &T->wheel[0][0]; + int wheel = (int) (index_ / WHEEL_LEN); + int slot = index_ % WHEEL_LEN; T->pending[wheel] &= ~(WHEEL_C(1) << slot); } |