From d7401c1493dbbd86e843c639182469c09331d077 Mon Sep 17 00:00:00 2001
From: Constantin Papizh <p.const@bk.ru>
Date: Thu, 28 Nov 2019 22:21:07 +0300
Subject: [PATCH] wepoll issues

---
 enc_server/CMakeLists.txt                        | 2 --
 enc_server/dap_enc_http.c                        | 3 ---
 enc_server/dap_enc_ks.c                          | 3 ---
 http_server/CMakeLists.txt                       | 4 ----
 http_server/dap_http.c                           | 3 ---
 http_server/dap_http_folder.c                    | 3 ---
 http_server/dap_http_simple.c                    | 3 ---
 http_server/http_client/dap_http_client.c        | 3 ---
 http_server/http_client/dap_http_client_simple.c | 3 ---
 http_server/http_client/dap_http_header.c        | 3 ---
 10 files changed, 30 deletions(-)

diff --git a/enc_server/CMakeLists.txt b/enc_server/CMakeLists.txt
index 6c6cce0..230dc17 100755
--- a/enc_server/CMakeLists.txt
+++ b/enc_server/CMakeLists.txt
@@ -18,7 +18,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/)
@@ -30,7 +29,6 @@ if(WIN32)
   target_link_libraries(dap_enc_server dap_core dap_crypto dap_server_core dap_http_server
 
   ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/libmemcached[x86_64CLANG].a
-  #${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]/libjson-c[x86_64CLANG].a
   KERNEL32
diff --git a/enc_server/dap_enc_http.c b/enc_server/dap_enc_http.c
index e06d565..a2cea6e 100755
--- a/enc_server/dap_enc_http.c
+++ b/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>
diff --git a/enc_server/dap_enc_ks.c b/enc_server/dap_enc_ks.c
index b41c724..73b425d 100755
--- a/enc_server/dap_enc_ks.c
+++ b/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>
diff --git a/http_server/CMakeLists.txt b/http_server/CMakeLists.txt
index b8f0b44..292c665 100755
--- a/http_server/CMakeLists.txt
+++ b/http_server/CMakeLists.txt
@@ -27,7 +27,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/)
@@ -39,11 +38,8 @@ target_include_directories(dap_http_server INTERFACE . http_client)
 
 if(WIN32)
   target_link_libraries(dap_http_server dap_core dap_crypto dap_server_core magic regex tre intl iconv
-
   ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/libmemcached[x86_64CLANG].a
-  #${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
diff --git a/http_server/dap_http.c b/http_server/dap_http.c
index 0e53814..72b52ef 100755
--- a/http_server/dap_http.c
+++ b/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>
diff --git a/http_server/dap_http_folder.c b/http_server/dap_http_folder.c
index b5e0b59..e3a3434 100755
--- a/http_server/dap_http_folder.c
+++ b/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>
diff --git a/http_server/dap_http_simple.c b/http_server/dap_http_simple.c
index d42d7c5..80e6698 100755
--- a/http_server/dap_http_simple.c
+++ b/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>
diff --git a/http_server/http_client/dap_http_client.c b/http_server/http_client/dap_http_client.c
index 6f4d7df..cb98606 100755
--- a/http_server/http_client/dap_http_client.c
+++ b/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>
diff --git a/http_server/http_client/dap_http_client_simple.c b/http_server/http_client/dap_http_client_simple.c
index 2e74761..ac99e67 100755
--- a/http_server/http_client/dap_http_client_simple.c
+++ b/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>
diff --git a/http_server/http_client/dap_http_header.c b/http_server/http_client/dap_http_header.c
index d5444d4..3064aba 100755
--- a/http_server/http_client/dap_http_header.c
+++ b/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>
-- 
GitLab