[tor-commits] [tor/master] Make compilation work under gcc-warnings

[nickm@xxxxxxxxxxxxxx]

commit 598cd4690cba5cd26326c2e37dfcde099904f5df
Author: Ola Bini <ola@xxxxxxxxxx>
Date:   Mon Oct 5 14:56:57 2015 -0500

    Make compilation work under gcc-warnings
---
 src/or/config.c |    1 -
 src/or/config.h |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 3130db1..7c57a4b 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -545,7 +545,6 @@ static const config_var_t testing_tor_network_defaults[] = {
 static char *get_windows_conf_root(void);
 #endif
 static int options_act_reversible(const or_options_t *old_options, char **msg);
-STATIC int options_act(const or_options_t *old_options);
 static int options_transition_allowed(const or_options_t *old,
                                       const or_options_t *new,
                                       char **msg);
diff --git a/src/or/config.h b/src/or/config.h
index 28d0cb4..756b08c 100644
--- a/src/or/config.h
+++ b/src/or/config.h
@@ -136,9 +136,9 @@ smartlist_t *get_options_from_transport_options_line(const char *line,
 smartlist_t *get_options_for_server_transport(const char *transport);
 
 #ifdef CONFIG_PRIVATE
+STATIC int options_act(const or_options_t *old_options);
 #ifdef TOR_UNIT_TESTS
 extern struct config_format_t options_format;
-STATIC int options_act(const or_options_t *old_options);
 #endif
 
 STATIC void or_options_free(or_options_t *options);



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