diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-07-16 14:49:41 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-16 14:49:41 -0400 |
| commit | f797ac465fa474bc530d76dd92e499584be18ca3 (patch) | |
| tree | 79b160150c018f3254aad6d0bc804c35b76fde78 | |
| parent | 4824f3ad9383f111901ab7e37fc70ec60b9d7a4c (diff) | |
| parent | c36bdbd53521a9b7d2213cde1f9f0f8fe8ac7441 (diff) | |
| download | tor-f797ac465fa474bc530d76dd92e499584be18ca3.tar.gz tor-f797ac465fa474bc530d76dd92e499584be18ca3.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
| -rw-r--r-- | changes/bug9254 | 4 | ||||
| -rw-r--r-- | src/or/circuitlist.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/changes/bug9254 b/changes/bug9254 new file mode 100644 index 0000000000..5179bdc523 --- /dev/null +++ b/changes/bug9254 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a spurious compilation warning with some older versions of + GCC on FreeBSD. Fixes bug 9254; bugfix on 0.2.4.14-alpha. + diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 70c8980055..5e51301ceb 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1642,8 +1642,10 @@ static size_t n_cells_in_circ_queues(const circuit_t *c) { size_t n = c->n_chan_cells.n; - if (! CIRCUIT_IS_ORIGIN(c)) - n += TO_OR_CIRCUIT((circuit_t*)c)->p_chan_cells.n; + if (! CIRCUIT_IS_ORIGIN(c)) { + circuit_t *cc = (circuit_t *) c; + n += TO_OR_CIRCUIT(cc)->p_chan_cells.n; + } return n; } |