[or-cvs] [tor/master 39/40] Move the header for bandwidth_weight_rule_to_string into reasons.h

[nickm at torproject.org]

Author: Sebastian Hahn <sebastian at torproject.org>
Date: Mon, 26 Jul 2010 11:37:13 +0200
Subject: Move the header for bandwidth_weight_rule_to_string into reasons.h
Commit: 986dd554f4cfbbc1b3a9296bea032b71ea7d9b39

---
 src/or/or.h         |    3 ---
 src/or/reasons.h    |    2 ++
 src/or/routerlist.c |    1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/or/or.h b/src/or/or.h
index 45812c5..572dc8b 100644
--- 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 08e9c00..1400e81 100644
--- 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 146040a..5f98abe 100644
--- 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"
-- 
1.7.1