summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-06-29 13:47:44 -0400
committerNick Mathewson <nickm@torproject.org>2015-06-29 13:47:44 -0400
commit753797391f789700ccf7ec9123076405f250cb93 (patch)
tree6e66310fece598fc40bf8b8f1f6976c3e0085bb3 /src/common
parentd9052c629b94343aef63f4e8c891c9c0a9c097b5 (diff)
downloadtor-753797391f789700ccf7ec9123076405f250cb93.tar.gz
tor-753797391f789700ccf7ec9123076405f250cb93.zip
More tweaks for windows compilation. (ick)
Diffstat (limited to 'src/common')
-rw-r--r--src/common/compat.h4
-rw-r--r--src/common/crypto.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/common/compat.h b/src/common/compat.h
index fbaeb6fe01..68985d8554 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -7,12 +7,12 @@
#define TOR_COMPAT_H
#include "orconfig.h"
-#include "torint.h"
-#include "testsupport.h"
#ifdef _WIN32
#include <winsock2.h>
#include <ws2tcpip.h>
#endif
+#include "torint.h"
+#include "testsupport.h"
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 984fe952e2..934679e67a 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -13,6 +13,7 @@
#include "orconfig.h"
#ifdef _WIN32
+#include <winsock2.h>
#include <windows.h>
#include <wincrypt.h>
/* Windows defines this; so does OpenSSL 0.9.8h and later. We don't actually