mirror of
https://github.com/ntop/n2n.git
synced 2024-04-21 16:31:34 +00:00
updated for compilation with VS2015 (#739)
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user