[tor-commits] [tor/master] Move router_reset_reachability() into correct header, add a stub

[nickm@xxxxxxxxxxxxxx]

commit d559ca3d5aa693e4606e34888048eeda0f5c2e97
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Feb 20 08:36:40 2020 -0500

    Move router_reset_reachability() into correct header, add a stub
    
    Without this, -O0 builds fail, which is a sign that LTO builds may
    fail too.
---
 src/feature/relay/router.h   | 1 -
 src/feature/relay/selftest.h | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/feature/relay/router.h b/src/feature/relay/router.h
index 782609d8a..2e07df2e8 100644
--- a/src/feature/relay/router.h
+++ b/src/feature/relay/router.h
@@ -117,7 +117,6 @@ const char *routerinfo_err_to_string(int err);
 int routerinfo_err_is_transient(int err);
 
 void router_reset_warnings(void);
-void router_reset_reachability(void);
 void router_free_all(void);
 
 #ifdef ROUTER_PRIVATE
diff --git a/src/feature/relay/selftest.h b/src/feature/relay/selftest.h
index c7987cf4a..f3dd698bb 100644
--- a/src/feature/relay/selftest.h
+++ b/src/feature/relay/selftest.h
@@ -21,6 +21,8 @@ void router_do_reachability_checks(int test_or, int test_dir);
 void router_orport_found_reachable(void);
 void router_dirport_found_reachable(void);
 void router_perform_bandwidth_test(int num_circs, time_t now);
+void router_reset_reachability(void);
+
 #else /* !defined(HAVE_MODULE_RELAY) */
 
 #define check_whether_orport_reachable(opts) \
@@ -32,6 +34,8 @@ void router_perform_bandwidth_test(int num_circs, time_t now);
   STMT_NIL
 #define router_dirport_found_reachable() \
   STMT_NIL
+#define router_reset_reachability() \
+  STMT_NIL
 
 static inline void
 router_do_reachability_checks(int test_or, int test_dir)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits