From 6f63f401fe31facee26a9da7b7fb64b99faed041 Mon Sep 17 00:00:00 2001
From: skyformat99 <10938976+skyformat99@users.noreply.github.com>
Date: Mon, 26 Jul 2021 15:08:05 +0800
Subject: [PATCH] updated for compilation with VS2015 (#739)

---
 include/n2n_define.h | 8 ++++++++
 src/n2n.c            | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/n2n_define.h b/include/n2n_define.h
index 69f7f78..b9cfc40 100644
--- a/include/n2n_define.h
+++ b/include/n2n_define.h
@@ -179,6 +179,14 @@ enum skip_add{SN_ADD = 0, SN_ADD_SKIP = 1, SN_ADD_ADDED = 2};
 #define N2N_IFNAMSIZ               16 /* 15 chars * NULL */
 #endif
 
+#ifdef _MSC_VER
+#define N2N_THREAD_RETURN_DATATYPE       DWORD WINAPI
+#define N2N_THREAD_PARAMETER_DATATYPE    LPVOID
+#else
+#define N2N_THREAD_RETURN_DATATYPE        void*
+#define N2N_THREAD_PARAMETER_DATATYPE     void*
+#endif
+
 #define SN_SELECTION_CRITERION_DATA_TYPE    uint32_t
 #define SN_SELECTION_CRITERION_BUF_SIZE     16
 
diff --git a/src/n2n.c b/src/n2n.c
index 8cbc9d9..553bc79 100644
--- a/src/n2n.c
+++ b/src/n2n.c
@@ -313,7 +313,7 @@ int supernode2sock (n2n_sock_t *sn, const n2n_sn_name_t addrIn) {
 }
 
 
-void *resolve_thread (void *p) {
+N2N_THREAD_RETURN_DATATYPE resolve_thread(N2N_THREAD_PARAMETER_DATATYPE p) {
 
 #ifdef HAVE_PTHREAD
     n2n_resolve_parameter_t *param = (n2n_resolve_parameter_t*)p;