Merge branch 'bugs-2706' into 'master'

wepoll issues

See merge request !5

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})

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
 

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
 

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"