8 files changed, 9 insertions, 9 deletions
diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index 323bb341..26a3b4af 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -39,7 +39,7 @@
 #include <string.h>
 //Sleep function (x = milliseconds)
-#ifdef WIN32
+#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
 #define c_sleep(x) Sleep(1*x)
diff --git a/testing/Lossless_UDP_testclient.c b/testing/Lossless_UDP_testclient.c
index 7e8f46b3..de34dd6b 100644
--- a/testing/Lossless_UDP_testclient.c
+++ b/testing/Lossless_UDP_testclient.c
@@ -36,7 +36,7 @@
 #include "../toxcore/Lossless_UDP.h"
 #include "misc_tools.c"
-#ifdef WIN32
+#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
 #define c_sleep(x) Sleep(1*x)
diff --git a/testing/Lossless_UDP_testserver.c b/testing/Lossless_UDP_testserver.c
index a890cebf..4ef098d2 100644
--- a/testing/Lossless_UDP_testserver.c
+++ b/testing/Lossless_UDP_testserver.c
@@ -37,7 +37,7 @@
 #include "misc_tools.c"
 //Sleep function (x = milliseconds)
-#ifdef WIN32
+#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
 #define c_sleep(x) Sleep(1*x)
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index 82dbd43c..969d6b1f 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -44,7 +44,7 @@
 #include "../toxcore/Messenger.h"
 #include "misc_tools.c"
-#ifdef WIN32
+#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
 #define c_sleep(x) Sleep(1*x)
diff --git a/testing/crypto_speed_test.c b/testing/crypto_speed_test.c
index ddf9f512..60ff1937 100644
--- a/testing/crypto_speed_test.c
+++ b/testing/crypto_speed_test.c
@@ -3,7 +3,7 @@
 #endif
 // Hi-resolution timer
-#ifdef WIN32
+#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
 #ifndef WINVER
 //Windows XP
 #define WINVER 0x0501
diff --git a/testing/experiment/group_chats_test.c b/testing/experiment/group_chats_test.c
index 900da79c..04fee327 100644
--- a/testing/experiment/group_chats_test.c
+++ b/testing/experiment/group_chats_test.c
@@ -1,7 +1,7 @@
 #include "../../toxcore/group_chats.h"
 #define NUM_CHATS 8
-#ifdef WIN32
+#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
 #define c_sleep(x) Sleep(1*x)
 #else
 #define c_sleep(x) usleep(1000*x)
diff --git a/testing/experiment/group_chats_test1.c b/testing/experiment/group_chats_test1.c
index efd9ae84..a74f808a 100644
--- a/testing/experiment/group_chats_test1.c
+++ b/testing/experiment/group_chats_test1.c
@@ -1,7 +1,7 @@
 #include "../../toxcore/group_chats.h"
 #define NUM_CHATS 8
-#ifdef WIN32
+#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
 #define c_sleep(x) Sleep(1*x)
 #else
 #define c_sleep(x) usleep(1000*x)
diff --git a/testing/nTox.c b/testing/nTox.c
index bf12f5b2..8f7dc7ea 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
-#ifdef __WIN32__
+#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
 #define _WIN32_WINNT 0x501
 #include <winsock2.h>
 #include <ws2tcpip.h>
@@ -44,7 +44,7 @@
 #include <time.h>
 #include <locale.h>
-#ifdef __WIN32__
+#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
 #define c_sleep(x) Sleep(1*x)
 #else
 #include <unistd.h>

diff --git a/testing/DHT_test.c b/testing/DHT_test.c index 323bb341..26a3b4af 100644 --- a/testing/DHT_test.c +++ b/testing/DHT_test.c
@@ -39,7 +39,7 @@
39	#include <string.h>	39	#include <string.h>
40		40
41	//Sleep function (x = milliseconds)	41	//Sleep function (x = milliseconds)
42	#ifdef WIN32	42	#if defined(_WIN32) \|\| defined(__WIN32__) \|\| defined (WIN32)
43		43
44	#define c_sleep(x) Sleep(1*x)	44	#define c_sleep(x) Sleep(1*x)
45		45


diff --git a/testing/Lossless_UDP_testclient.c b/testing/Lossless_UDP_testclient.c index 7e8f46b3..de34dd6b 100644 --- a/testing/Lossless_UDP_testclient.c +++ b/testing/Lossless_UDP_testclient.c
@@ -36,7 +36,7 @@
36	#include "../toxcore/Lossless_UDP.h"	36	#include "../toxcore/Lossless_UDP.h"
37	#include "misc_tools.c"	37	#include "misc_tools.c"
38		38
39	#ifdef WIN32	39	#if defined(_WIN32) \|\| defined(__WIN32__) \|\| defined (WIN32)
40		40
41	#define c_sleep(x) Sleep(1*x)	41	#define c_sleep(x) Sleep(1*x)
42		42


diff --git a/testing/Lossless_UDP_testserver.c b/testing/Lossless_UDP_testserver.c index a890cebf..4ef098d2 100644 --- a/testing/Lossless_UDP_testserver.c +++ b/testing/Lossless_UDP_testserver.c
@@ -37,7 +37,7 @@
37	#include "misc_tools.c"	37	#include "misc_tools.c"
38		38
39	//Sleep function (x = milliseconds)	39	//Sleep function (x = milliseconds)
40	#ifdef WIN32	40	#if defined(_WIN32) \|\| defined(__WIN32__) \|\| defined (WIN32)
41		41
42	#define c_sleep(x) Sleep(1*x)	42	#define c_sleep(x) Sleep(1*x)
43		43


diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c index 82dbd43c..969d6b1f 100644 --- a/testing/Messenger_test.c +++ b/testing/Messenger_test.c
@@ -44,7 +44,7 @@
44	#include "../toxcore/Messenger.h"	44	#include "../toxcore/Messenger.h"
45	#include "misc_tools.c"	45	#include "misc_tools.c"
46		46
47	#ifdef WIN32	47	#if defined(_WIN32) \|\| defined(__WIN32__) \|\| defined (WIN32)
48		48
49	#define c_sleep(x) Sleep(1*x)	49	#define c_sleep(x) Sleep(1*x)
50		50


diff --git a/testing/crypto_speed_test.c b/testing/crypto_speed_test.c index ddf9f512..60ff1937 100644 --- a/testing/crypto_speed_test.c +++ b/testing/crypto_speed_test.c
@@ -3,7 +3,7 @@
3	#endif	3	#endif
4		4
5	// Hi-resolution timer	5	// Hi-resolution timer
6	#ifdef WIN32	6	#if defined(_WIN32) \|\| defined(__WIN32__) \|\| defined (WIN32)
7	#ifndef WINVER	7	#ifndef WINVER
8	//Windows XP	8	//Windows XP
9	#define WINVER 0x0501	9	#define WINVER 0x0501


diff --git a/testing/experiment/group_chats_test.c b/testing/experiment/group_chats_test.c index 900da79c..04fee327 100644 --- a/testing/experiment/group_chats_test.c +++ b/testing/experiment/group_chats_test.c
@@ -1,7 +1,7 @@
1	#include "../../toxcore/group_chats.h"	1	#include "../../toxcore/group_chats.h"
2	#define NUM_CHATS 8	2	#define NUM_CHATS 8
3		3
4	#ifdef WIN32	4	#if defined(_WIN32) \|\| defined(__WIN32__) \|\| defined (WIN32)
5	#define c_sleep(x) Sleep(1*x)	5	#define c_sleep(x) Sleep(1*x)
6	#else	6	#else
7	#define c_sleep(x) usleep(1000*x)	7	#define c_sleep(x) usleep(1000*x)


diff --git a/testing/experiment/group_chats_test1.c b/testing/experiment/group_chats_test1.c index efd9ae84..a74f808a 100644 --- a/testing/experiment/group_chats_test1.c +++ b/testing/experiment/group_chats_test1.c
@@ -1,7 +1,7 @@
1	#include "../../toxcore/group_chats.h"	1	#include "../../toxcore/group_chats.h"
2	#define NUM_CHATS 8	2	#define NUM_CHATS 8
3		3
4	#ifdef WIN32	4	#if defined(_WIN32) \|\| defined(__WIN32__) \|\| defined (WIN32)
5	#define c_sleep(x) Sleep(1*x)	5	#define c_sleep(x) Sleep(1*x)
6	#else	6	#else
7	#define c_sleep(x) usleep(1000*x)	7	#define c_sleep(x) usleep(1000*x)


diff --git a/testing/nTox.c b/testing/nTox.c index bf12f5b2..8f7dc7ea 100644 --- a/testing/nTox.c +++ b/testing/nTox.c
@@ -24,7 +24,7 @@
24	#include "config.h"	24	#include "config.h"
25	#endif	25	#endif
26		26
27	#ifdef __WIN32__	27	#if defined(_WIN32) \|\| defined(__WIN32__) \|\| defined (WIN32)
28	#define _WIN32_WINNT 0x501	28	#define _WIN32_WINNT 0x501
29	#include <winsock2.h>	29	#include <winsock2.h>
30	#include <ws2tcpip.h>	30	#include <ws2tcpip.h>
@@ -44,7 +44,7 @@
44	#include <time.h>	44	#include <time.h>
45	#include <locale.h>	45	#include <locale.h>
46		46
47	#ifdef __WIN32__	47	#if defined(_WIN32) \|\| defined(__WIN32__) \|\| defined (WIN32)
48	#define c_sleep(x) Sleep(1*x)	48	#define c_sleep(x) Sleep(1*x)
49	#else	49	#else
50	#include <unistd.h>	50	#include <unistd.h>