From 8de30467285db82cdeef34e95eae60efecec95d3 Mon Sep 17 00:00:00 2001 From: Constantin Papizh <p.const@bk.ru> Date: Thu, 28 Nov 2019 22:19:02 +0300 Subject: [PATCH] wepoll issues --- CMakeLists.txt | 1 - dap_chain_net.c | 3 --- dap_chain_node.c | 3 --- dap_chain_node_cli.c | 3 --- dap_chain_node_cli_cmd.c | 3 --- dap_chain_node_client.c | 3 --- dap_chain_node_remote.c | 3 --- 7 files changed, 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f689ded56..ef1bccda3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,7 +47,6 @@ if(WIN32) include_directories(../libdap/src/win32/) include_directories(../3rdparty/libmemcached/) include_directories(../3rdparty/libmemcached/win32/) - include_directories(../3rdparty/wepoll/include/) include_directories(../3rdparty/uthash/src/) include_directories(../3rdparty/libjson-c/) include_directories(../3rdparty/curl/include/) diff --git a/dap_chain_net.c b/dap_chain_net.c index 54b24eb00d..0863ab6046 100644 --- a/dap_chain_net.c +++ b/dap_chain_net.c @@ -38,14 +38,11 @@ #endif #ifdef WIN32 -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 #include <winsock2.h> #include <windows.h> #include <mswsock.h> #include <ws2tcpip.h> #include <io.h> -#include <wepoll.h> #endif #include <pthread.h> diff --git a/dap_chain_node.c b/dap_chain_node.c index 1fb9ae970c..790b627340 100644 --- a/dap_chain_node.c +++ b/dap_chain_node.c @@ -28,14 +28,11 @@ #include <string.h> #ifdef WIN32 -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 #include <winsock2.h> #include <windows.h> #include <mswsock.h> #include <ws2tcpip.h> #include <io.h> -#include <wepoll.h> #include <pthread.h> #else #include <sys/socket.h> diff --git a/dap_chain_node_cli.c b/dap_chain_node_cli.c index fb50694a15..063e73a093 100644 --- a/dap_chain_node_cli.c +++ b/dap_chain_node_cli.c @@ -46,14 +46,11 @@ typedef int SOCKET; #define INVALID_SOCKET -1 // for win32 = (SOCKET)(~0) // for Windows #else -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 #include <winsock2.h> #include <windows.h> #include <mswsock.h> #include <ws2tcpip.h> #include <io.h> -#include <wepoll.h> #endif #include <pthread.h> diff --git a/dap_chain_node_cli_cmd.c b/dap_chain_node_cli_cmd.c index 8ae4d435ec..59df5b3a73 100644 --- a/dap_chain_node_cli_cmd.c +++ b/dap_chain_node_cli_cmd.c @@ -37,14 +37,11 @@ #include <dirent.h> #ifdef WIN32 -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 #include <winsock2.h> #include <windows.h> #include <mswsock.h> #include <ws2tcpip.h> #include <io.h> -#include <wepoll.h> #include <pthread.h> #else #include <sys/types.h> diff --git a/dap_chain_node_client.c b/dap_chain_node_client.c index 0ece420862..53b815308d 100644 --- a/dap_chain_node_client.c +++ b/dap_chain_node_client.c @@ -31,14 +31,11 @@ #include <string.h> #ifdef WIN32 -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 #include <winsock2.h> #include <windows.h> #include <mswsock.h> #include <ws2tcpip.h> #include <io.h> -#include <wepoll.h> #include <pthread.h> #endif diff --git a/dap_chain_node_remote.c b/dap_chain_node_remote.c index 515d1123b8..cabf4dd34e 100644 --- a/dap_chain_node_remote.c +++ b/dap_chain_node_remote.c @@ -28,14 +28,11 @@ #include <pthread.h> #ifdef WIN32 -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 #include <winsock2.h> #include <windows.h> #include <mswsock.h> #include <ws2tcpip.h> #include <io.h> -#include <wepoll.h> #endif #include "uthash.h" -- GitLab