diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-07-16 14:48:12 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-16 14:48:12 -0400 |
| commit | c36bdbd53521a9b7d2213cde1f9f0f8fe8ac7441 (patch) | |
| tree | a6d25aec6de660144755e8a34889bd6679334dab | |
| parent | 7a4145c45aa0833af96cdb4b5c3fba90731c7037 (diff) | |
| download | tor-c36bdbd53521a9b7d2213cde1f9f0f8fe8ac7441.tar.gz tor-c36bdbd53521a9b7d2213cde1f9f0f8fe8ac7441.zip | |
Re-do a cast in order to make old buggy freebsd gcc happy
Fix for #9254. Bugfix on 0.2.4.14-alpha.
This is not actually a bug in the Tor code.
| -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 3dc362f500..daeaa37b1e 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1518,8 +1518,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; } |