diff --git a/CMakeLists.txt b/CMakeLists.txt index 693cd3df5f24ee258ad4872f9d6f282ab5096165..6de87bba9ddb0b42997f6ecd3b82b13ec3697435 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON)) add_subdirectory(test) endif() -set(DAP_UDP_SERVER_SRCS dap_udp_server.c dap_udp_client.h dap_udp_client.c) +set(DAP_UDP_SERVER_SRCS dap_udp_server.c dap_udp_client.h dap_udp_client.c ) if(WIN32) include_directories(../libdap/src/win32/) @@ -27,6 +27,7 @@ if(WIN32) include_directories(../3rdparty/uthash/src/) include_directories(../3rdparty/libjson-c/) include_directories(../3rdparty/curl/include/) + #include_directories(../sources/wepoll/) endif() add_library(${PROJECT_NAME} STATIC ${DAP_UDP_SERVER_SRCS}) diff --git a/dap_udp_client.c b/dap_udp_client.c index 15b9971f10e45a93779b1731ff3758710cdc9132..aa96524febf5756f4a90530770a211591638c3b3 100755 --- a/dap_udp_client.c +++ b/dap_udp_client.c @@ -38,15 +38,12 @@ #include <fcntl.h> #include <sys/epoll.h> #else -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 #include <winsock2.h> #include <windows.h> #include <mswsock.h> #include <ws2tcpip.h> #include <io.h> //#include "wrappers.h" -#include <wepoll.h> #include <pthread.h> #endif diff --git a/dap_udp_server.c b/dap_udp_server.c index dded3f54223165e3130ee589278f8b6f506549c9..92b7b3f348f5b72a35faaaeae2c0a3a4a89a7694 100755 --- a/dap_udp_server.c +++ b/dap_udp_server.c @@ -40,15 +40,12 @@ #include <fcntl.h> #include <sys/epoll.h> #else -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 #include <winsock2.h> #include <windows.h> #include <mswsock.h> #include <ws2tcpip.h> #include <io.h> //#include "wrappers.h" -#include <wepoll.h> #include <pthread.h> #endif diff --git a/dap_udp_server.h b/dap_udp_server.h index 3d6335638af97eae532cc9fd9f2e78c3e976c68f..2ed9465c012118bf5f4edd3761ae1b92f58fa39a 100755 --- a/dap_udp_server.h +++ b/dap_udp_server.h @@ -32,8 +32,6 @@ #include <sys/select.h> #include <sys/queue.h> #define EPOLL_HANDLE int -#else -#define EPOLL_HANDLE HANDLE #endif #include "dap_udp_client.h"