clang-i386: use house style for public-when-testing variables

This fixes a warning from jenkins.

src/or/main.h

@@ -92,6 +92,9 @@ STATIC void init_connection_lists(void);
 STATIC void close_closeable_connections(void);
 STATIC void initialize_periodic_events(void);
 STATIC void teardown_periodic_events(void);
+#ifdef TOR_UNIT_TESTS
+extern smartlist_t *connection_array;
+#endif
 #endif
 
 #endif

src/or/networkstatus.h

@@ -139,7 +139,9 @@ void vote_routerstatus_free(vote_routerstatus_t *rs);
 #ifdef TOR_UNIT_TESTS
 STATIC int networkstatus_set_current_consensus_from_ns(networkstatus_t *c,
                                                 const char *flavor);
-#endif // TOR_UNIT_TESTS
+extern networkstatus_t *current_ns_consensus;
+extern networkstatus_t *current_md_consensus;
+#endif
 #endif
 
 #endif

src/test/test_channelpadding.c

@@ -1,4 +1,6 @@
 #define TOR_CHANNEL_INTERNAL_
+#define MAIN_PRIVATE
+#define NETWORKSTATUS_PRIVATE
 #include "or.h"
 #include "test.h"
 #include "testsupport.h"
@@ -11,12 +13,10 @@
 #include "config.h"
 #include <event.h>
 #include "compat_time.h"
+#include "main.h"
+#include "networkstatus.h"
 #include "log_test_helpers.h"
 
-extern smartlist_t *connection_array;
-extern networkstatus_t *current_ns_consensus;
-extern networkstatus_t *current_md_consensus;
-
 int channelpadding_get_netflow_inactive_timeout_ms(channel_t *chan);
 int64_t channelpadding_compute_time_until_pad_for_netflow(channel_t *chan);
 int channelpadding_send_disable_command(channel_t*);