Make compilation work under gcc-warnings

diff --git a/src/or/config.c b/src/or/config.c
index 3130db1f2bdaadf420a775cd4af4052a3c907f8c..7c57a4be93ac167fe79237e5e16caaeeed7cbfa8 100644 (file)
--- 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 28d0cb409bfdf86506bc4b9e017626555c5a7d0b..756b08c2b5d7450ff561fe41b612518b74d9c0d9 100644 (file)
--- 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);