commit b189c613bb27695753761d0851c17f521e8f00de Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 8 15:11:18 2017 -0500

move a macro; fix a build? --- src/or/protover.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/protover.h b/src/or/protover.h index 8bbc2fc71..477274e29 100644 --- a/src/or/protover.h +++ b/src/or/protover.h @@ -83,11 +83,11 @@ STATIC char *encode_protocol_list(const smartlist_t *sl); STATIC const char *protocol_type_to_str(protocol_type_t pr); STATIC int str_to_protocol_type(const char *s, protocol_type_t *pr_out); STATIC void proto_entry_free_(proto_entry_t *entry); +#endif /* !defined(HAVE_RUST) && defined(TOR_UNIT_TESTS) */ + #define proto_entry_free(entry) \ FREE_AND_NULL(proto_entry_t, proto_entry_free_, (entry))

-#endif /* !defined(HAVE_RUST) && defined(TOR_UNIT_TESTS) */ - #endif /* defined(PROTOVER_PRIVATE) */

#endif /* !defined(TOR_PROTOVER_H) */