From: Nick Mathewson Date: Thu, 19 Jul 2012 13:04:24 +0000 (-0400) Subject: Avoid double-typedef of transport_t. X-Git-Tag: tor-0.2.4.1-alpha~85 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24451e6f7d6813642cc3b092bf085fdbb4a9aefc;p=thirdparty%2Ftor.git Avoid double-typedef of transport_t. You can say "struct foo_t" as much as you want, but you'd better not have "typedef struct foo_t foo_t" more than once. Fix for bug 6416. Bug not in any released version of Tor. --- diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index a7beccebb6..d4a78b9e1e 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -137,9 +137,9 @@ int circuit_build_times_get_bw_scale(networkstatus_t *ns); /* DOCDOC find_transport_name_by_bridge_addrport */ const char *find_transport_name_by_bridge_addrport(const tor_addr_t *addr, uint16_t port); -typedef struct transport_t transport_t; +struct transport_t; int find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, - const transport_t **transport); + const struct transport_t **transport); #endif