Merge branch 'bugs-2706' into 'master'

wepoll issues

See merge request !5

enc_server/dap_enc_http.c

@@ -25,15 +25,12 @@
 #include "dap_common.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 <time.h>
-#include <wepoll.h>
 #endif
 
 #include <pthread.h>

enc_server/dap_enc_ks.c

@@ -19,15 +19,12 @@
 */
 
 #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 <time.h>
-#include <wepoll.h>
 #endif
 
 #include <pthread.h>

http_server/CMakeLists.txt

@@ -39,7 +39,6 @@ if(WIN32)
  
  #${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/libmagic[x86_64CLANG].a
   ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/curl[x86_64CLANG].a
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/wepoll[x86_64CLANG].a
   KERNEL32
   USER32
   SHELL32

http_server/dap_http.c

@@ -35,15 +35,12 @@
 #include <sys/stat.h>
 #include <netdb.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 <time.h>
-#include <wepoll.h>
 #endif
 
 #include <pthread.h>

http_server/dap_http_folder.c

@@ -27,14 +27,11 @@
 #include <sys/types.h>
 #include <sys/stat.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 <wepoll.h>
 #endif
 
 #include <pthread.h>

http_server/dap_http_simple.c

@@ -30,14 +30,11 @@ See more details here <http://www.gnu.org/licenses/>.
 #ifndef _WIN32
 #include <sys/queue.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 <wepoll.h>
 #endif
 
 #include <pthread.h>

http_server/http_client/dap_http_client.c

@@ -26,15 +26,12 @@
 #ifndef _WIN32
 #include <libgen.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>
 #endif
 
 #include <pthread.h>

http_server/http_client/dap_http_client_simple.c

@@ -10,8 +10,6 @@
 #include <unistd.h>
 
 #ifdef _WIN32
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600
 #include <winsock2.h>
 #include <windows.h>
 #include <mswsock.h>
@@ -19,7 +17,6 @@
 #include <io.h>
 #include <time.h>
 //#include "wrappers.h"
-#include <wepoll.h>
 #endif
 
 #include <pthread.h>

http_server/http_client/dap_http_header.c

@@ -24,15 +24,12 @@
 #include <string.h>
 #include <stdlib.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 "wrappers.h"
-#include <wepoll.h>
 #endif
 
 #include <pthread.h>