nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

More tweaks for windows compilation. (ick)

Browse Source
This commit is contained in:
Nick Mathewson 2015-06-29 13:47:44 -04:00
parent d9052c629b
commit 753797391f
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/compat.h
View File

@ -7,12 +7,12 @@
#define TOR_COMPAT_H #define TOR_COMPAT_H
#include "orconfig.h" #include "orconfig.h"
#include "torint.h"
#include "testsupport.h"
#ifdef _WIN32 #ifdef _WIN32
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#endif #endif
#include "torint.h"
#include "testsupport.h"
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
#include <sys/param.h> #include <sys/param.h>
#endif #endif

1
src/common/crypto.c
View File

@ -13,6 +13,7 @@
#include "orconfig.h" #include "orconfig.h"
#ifdef _WIN32 #ifdef _WIN32
#include <winsock2.h>
#include <windows.h> #include <windows.h>
#include <wincrypt.h> #include <wincrypt.h>
/* Windows defines this; so does OpenSSL 0.9.8h and later. We don't actually /* Windows defines this; so does OpenSSL 0.9.8h and later. We don't actually

1
src/or/or.h
View File

@ -67,6 +67,7 @@
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
#include <winsock2.h>
#include <io.h> #include <io.h>
#include <process.h> #include <process.h>
#include <direct.h> #include <direct.h>

26
src/test/test_containers.c
View File

@ -887,7 +887,7 @@ static void
test_container_order_functions(void *arg) test_container_order_functions(void *arg)
{ {
int lst[25], n = 0; 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; // int a=12,b=24,c=25,d=60,e=77;
#define median() median_int(lst, n) #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 */ tt_int_op(25,OP_EQ, median()); /* 12,12,24,25,60,77,77 */
#undef median #undef median
#define third_quartile() third_quartile_uint32(lst2, n) #define third_quartile() third_quartile_uint32(lst_2, n)
n = 0; n = 0;
lst2[n++] = 1; lst_2[n++] = 1;
tt_int_op(1,OP_EQ, third_quartile()); /* ~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~ */ tt_int_op(2,OP_EQ, third_quartile()); /* 1, ~2~ */
lst2[n++] = 3; lst_2[n++] = 3;
lst2[n++] = 4; lst_2[n++] = 4;
lst2[n++] = 5; lst_2[n++] = 5;
tt_int_op(4,OP_EQ, third_quartile()); /* 1, 2, 3, ~4~, 5 */ tt_int_op(4,OP_EQ, third_quartile()); /* 1, 2, 3, ~4~, 5 */
lst2[n++] = 6; lst_2[n++] = 6;
lst2[n++] = 7; lst_2[n++] = 7;
lst2[n++] = 8; lst_2[n++] = 8;
lst2[n++] = 9; lst_2[n++] = 9;
tt_int_op(7,OP_EQ, third_quartile()); /* 1, 2, 3, 4, 5, 6, ~7~, 8, 9 */ tt_int_op(7,OP_EQ, third_quartile()); /* 1, 2, 3, 4, 5, 6, ~7~, 8, 9 */
lst2[n++] = 10; lst_2[n++] = 10;
lst2[n++] = 11; lst_2[n++] = 11;
/* 1, 2, 3, 4, 5, 6, 7, 8, ~9~, 10, 11 */ /* 1, 2, 3, 4, 5, 6, 7, 8, ~9~, 10, 11 */
tt_int_op(9,OP_EQ, third_quartile()); tt_int_op(9,OP_EQ, third_quartile());