Move the header for bandwidth_weight_rule_to_string into reasons.h

diff --git a/src/or/or.h b/src/or/or.h
index 45812c5735c57e35020cce141e5c5630bc771a16..572dc8b96d06bb61babf017a230052f9e352bac6 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3443,9 +3443,6 @@ typedef enum bandwidth_weight_rule_t {
   WEIGHT_FOR_DIR
 } bandwidth_weight_rule_t;
 
-/* XXXX actually declared in reasons.c */
-const char *bandwidth_weight_rule_to_string(enum bandwidth_weight_rule_t rule);
-
 /** Flags to be passed to control router_choose_random_node() to indicate what
  * kind of nodes to pick according to what algorithm. */
 typedef enum {

diff --git a/src/or/reasons.h b/src/or/reasons.h
index 08e9c0057d520b03754debc2aa055f9a3d4aa8dd..1400e814536a1bcfb1138b2d712c8b1671be1084 100644 (file)
--- a/src/or/reasons.h
+++ b/src/or/reasons.h
@@ -25,5 +25,7 @@ const char *circuit_end_reason_to_control_string(int reason);
 const char *socks4_response_code_to_string(uint8_t code);
 const char *socks5_response_code_to_string(uint8_t code);
 
+const char *bandwidth_weight_rule_to_string(enum bandwidth_weight_rule_t rule);
+
 #endif
 

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 146040ac6814db681bbb421b7ea512ffcc80eb78..5f98abe01b6d42f6e9466cd7671ffc67a9ccd4eb 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -24,6 +24,7 @@
 #include "main.h"
 #include "networkstatus.h"
 #include "policies.h"
+#include "reasons.h"
 #include "rendcommon.h"
 #include "rendservice.h"
 #include "rephist.h"