summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-09-11 16:52:24 -0400
committerNick Mathewson <nickm@torproject.org>2016-09-11 16:52:24 -0400
commit64521a9d355da9f21d81c8a82056e544372685b2 (patch)
treea3ce5b736e41db284f4ae2b5a925ac5195c77acf /src/test
parent77e2be06f6ff9c7328144fe5df3e3bac64106449 (diff)
parent25513ae174d80a62ca0a8dcca52683089be95ea3 (diff)
downloadtor-64521a9d355da9f21d81c8a82056e544372685b2.tar.gz
tor-64521a9d355da9f21d81c8a82056e544372685b2.zip
Merge remote-tracking branch 'public/solaris_warnings_028'
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test-child.c2
-rw-r--r--src/test/test-memwipe.c1
-rw-r--r--src/test/test_channeltls.c2
-rw-r--r--src/test/test_scheduler.c3
-rw-r--r--src/test/test_status.c2
5 files changed, 7 insertions, 3 deletions
diff --git a/src/test/test-child.c b/src/test/test-child.c
index e2552a499d..fdf3ccec0a 100644
--- a/src/test/test-child.c
+++ b/src/test/test-child.c
@@ -1,8 +1,8 @@
/* Copyright (c) 2011-2016, The Tor Project, Inc. */
/* See LICENSE for licensing information */
-#include <stdio.h>
#include "orconfig.h"
+#include <stdio.h>
#ifdef _WIN32
#define WINDOWS_LEAN_AND_MEAN
#include <windows.h>
diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c
index 8187c45461..21882448c3 100644
--- a/src/test/test-memwipe.c
+++ b/src/test/test-memwipe.c
@@ -1,3 +1,4 @@
+#include "orconfig.h"
#include <string.h>
#include <stdio.h>
#include <sys/types.h>
diff --git a/src/test/test_channeltls.c b/src/test/test_channeltls.c
index bde46a2998..08442e01b6 100644
--- a/src/test/test_channeltls.c
+++ b/src/test/test_channeltls.c
@@ -1,6 +1,8 @@
/* Copyright (c) 2014-2016, The Tor Project, Inc. */
/* See LICENSE for licensing information */
+#include "orconfig.h"
+
#include <math.h>
#define TOR_CHANNEL_INTERNAL_
diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c
index 2e0736f99b..05ea8e86e8 100644
--- a/src/test/test_scheduler.c
+++ b/src/test/test_scheduler.c
@@ -1,10 +1,9 @@
/* Copyright (c) 2014-2016, The Tor Project, Inc. */
/* See LICENSE for licensing information */
-#include <math.h>
-
#include "orconfig.h"
+#include <math.h>
#include <event2/event.h>
#define TOR_CHANNEL_INTERNAL_
diff --git a/src/test/test_status.c b/src/test/test_status.c
index b4438aabe9..a3b1a2af87 100644
--- a/src/test/test_status.c
+++ b/src/test/test_status.c
@@ -3,6 +3,8 @@
#define LOG_PRIVATE
#define REPHIST_PRIVATE
+#include "orconfig.h"
+
#include <float.h>
#include <math.h>