[tor-commits] [tor/master] Fix compilation warnings

nickm at torproject.org nickm at torproject.org
Fri Nov 20 15:54:16 UTC 2015


commit e3cf39cefd24e2cc0d70a1726ac19fc86e4e47e7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 20 10:51:19 2015 -0500

    Fix compilation warnings
---
 src/or/policies.c      |    2 ++
 src/or/policies.h      |    2 +-
 src/test/test_policy.c |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/or/policies.c b/src/or/policies.c
index f4cde43..d588a80 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -8,6 +8,8 @@
  * \brief Code to parse and use address policies and exit policies.
  **/
 
+#define POLICIES_PRIVATE
+
 #include "or.h"
 #include "config.h"
 #include "dirserv.h"
diff --git a/src/or/policies.h b/src/or/policies.h
index 72e62c7..bb56bf4 100644
--- a/src/or/policies.h
+++ b/src/or/policies.h
@@ -93,7 +93,7 @@ addr_policy_result_t compare_tor_addr_to_short_policy(
                           const short_policy_t *policy);
 
 #ifdef POLICIES_PRIVATE
-void append_exit_policy_string(smartlist_t **policy, const char *more);
+STATIC void append_exit_policy_string(smartlist_t **policy, const char *more);
 #endif
 
 #endif
diff --git a/src/test/test_policy.c b/src/test/test_policy.c
index 9ab3abe..4cf56c8 100644
--- a/src/test/test_policy.c
+++ b/src/test/test_policy.c
@@ -826,7 +826,7 @@ test_dump_exit_policy_to_string(void *arg)
 }
 
 static routerinfo_t *mock_desc_routerinfo = NULL;
-const routerinfo_t *mock_router_get_my_routerinfo(void)
+static const routerinfo_t *mock_router_get_my_routerinfo(void)
 {
   return mock_desc_routerinfo;
 }





More information about the tor-commits mailing list