diff options
| author | teor <teor@torproject.org> | 2019-08-09 13:50:42 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-08-09 13:50:42 +1000 |
| commit | 05018d55cabdf9c0f80d6bf78ca30c795b60500e (patch) | |
| tree | dca3bb80cf54c440719d9826d038a3dbfed832d0 | |
| parent | 2bc8989d833c3b583395380031e9b730d1c3fb37 (diff) | |
| parent | 031ed59dbaf62d9cebd09f98f563c228fe6822f6 (diff) | |
| download | tor-05018d55cabdf9c0f80d6bf78ca30c795b60500e.tar.gz tor-05018d55cabdf9c0f80d6bf78ca30c795b60500e.zip | |
Merge remote-tracking branch 'tor-github/pr/957' into maint-0.2.9
| -rw-r--r-- | src/or/rephist.h | 4 | ||||
| -rw-r--r-- | src/test/test_relay.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/or/rephist.h b/src/or/rephist.h index c464b34f7c..303cd74f7a 100644 --- a/src/or/rephist.h +++ b/src/or/rephist.h @@ -117,9 +117,7 @@ extern uint32_t rephist_total_num; #ifdef TOR_UNIT_TESTS extern int onion_handshakes_requested[MAX_ONION_HANDSHAKE_TYPE+1]; extern int onion_handshakes_assigned[MAX_ONION_HANDSHAKE_TYPE+1]; -typedef struct bw_array_t bw_array_t; -extern bw_array_t *write_array; +extern struct bw_array_t *write_array; #endif #endif - diff --git a/src/test/test_relay.c b/src/test/test_relay.c index 57dcb2406a..d4ebb23382 100644 --- a/src/test/test_relay.c +++ b/src/test/test_relay.c @@ -19,6 +19,8 @@ static or_circuit_t * new_fake_orcirc(channel_t *nchan, channel_t *pchan); static void test_relay_append_cell_to_circuit_queue(void *arg); + +typedef struct bw_array_t bw_array_t; uint64_t find_largest_max(bw_array_t *b); void commit_max(bw_array_t *b); void advance_obs(bw_array_t *b); |