[tor-commits] [tor/master] More tweaks for windows compilation. (ick)

[nickm at torproject.org]

commit 753797391f789700ccf7ec9123076405f250cb93
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 29 13:47:44 2015 -0400

    More tweaks for windows compilation. (ick)
---
 src/common/compat.h        |    4 ++--
 src/common/crypto.c        |    1 +
 src/or/or.h                |    1 +
 src/test/test_containers.c |   26 +++++++++++++-------------
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/common/compat.h b/src/common/compat.h
index fbaeb6f..68985d8 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 984fe95..934679e 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
diff --git a/src/or/or.h b/src/or/or.h
index 0950277..431105b 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -67,6 +67,7 @@
 #endif
 
 #ifdef _WIN32
+#include <winsock2.h>
 #include <io.h>
 #include <process.h>
 #include <direct.h>
diff --git a/src/test/test_containers.c b/src/test/test_containers.c
index 3d150f5..2ae81bf 100644
--- a/src/test/test_containers.c
+++ b/src/test/test_containers.c
@@ -887,7 +887,7 @@ static void
 test_container_order_functions(void *arg)
 {
   int lst[25], n = 0;
-  unsigned int lst2[25];
+  unsigned int lst_2[25];
   //  int a=12,b=24,c=25,d=60,e=77;
 
 #define median() median_int(lst, n)
@@ -910,24 +910,24 @@ test_container_order_functions(void *arg)
   tt_int_op(25,OP_EQ, median()); /* 12,12,24,25,60,77,77 */
 #undef median
 
-#define third_quartile() third_quartile_uint32(lst2, n)
+#define third_quartile() third_quartile_uint32(lst_2, n)
 
   n = 0;
-  lst2[n++] = 1;
+  lst_2[n++] = 1;
   tt_int_op(1,OP_EQ, third_quartile()); /* ~1~ */
-  lst2[n++] = 2;
+  lst_2[n++] = 2;
   tt_int_op(2,OP_EQ, third_quartile()); /* 1, ~2~ */
-  lst2[n++] = 3;
-  lst2[n++] = 4;
-  lst2[n++] = 5;
+  lst_2[n++] = 3;
+  lst_2[n++] = 4;
+  lst_2[n++] = 5;
   tt_int_op(4,OP_EQ, third_quartile()); /* 1, 2, 3, ~4~, 5 */
-  lst2[n++] = 6;
-  lst2[n++] = 7;
-  lst2[n++] = 8;
-  lst2[n++] = 9;
+  lst_2[n++] = 6;
+  lst_2[n++] = 7;
+  lst_2[n++] = 8;
+  lst_2[n++] = 9;
   tt_int_op(7,OP_EQ, third_quartile()); /* 1, 2, 3, 4, 5, 6, ~7~, 8, 9 */
-  lst2[n++] = 10;
-  lst2[n++] = 11;
+  lst_2[n++] = 10;
+  lst_2[n++] = 11;
   /* 1, 2, 3, 4, 5, 6, 7, 8, ~9~, 10, 11 */
   tt_int_op(9,OP_EQ, third_quartile());