tor

commit 05d25d06b62a9ee2cc77e44a66be2d9a95cae636
parent 684b396ce5c0a4d5ea70ec01a22d6d368819c873
Author: teor <teor@torproject.org>
Date:   Tue, 16 Apr 2019 15:39:45 +1000

rephist: fix an undeclared type compilation error

In 0.3.4 and later, we declare write_array as:
extern struct bw_array_t *write_array;
...
typedef struct bw_array_t bw_array_t;

But in 0.2.9, we declare write_array as:
typedef struct bw_array_t bw_array_t;
extern bw_array_t *write_array;

And then again in rephist.c:
typedef struct bw_array_t bw_array_t;

So some compilers fail with a duplicate declaration error.

We backport 684b396ce5, which removes the duplicate declaration.
And this commit deals with the undeclared type error.

Backports a single line from merge commit 813019cc57.

Fixes bug 30184; not in any released version of Tor.

Diffstat:
M
src/or/rephist.h
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/or/rephist.h b/src/or/rephist.h
@@ -117,7 +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];
-extern bw_array_t *write_array;
+extern struct bw_array_t *write_array;
 #endif
 
 #endif