diff --git a/enc_server/CMakeLists.txt b/enc_server/CMakeLists.txt index 6c6cce0f25ee0beef6f9e5bc3acb7b42bda40fa4..230dc1718b2c5d967bb91b5e8cb4a4fb8c1f70a0 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 e06d5650643e9cd86961bfc37e00e01c3f16f91e..a2cea6e4493375a0816a9c69b7cdf4d1f0bb7f2c 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 b41c7246618642bcd52fa1a800a99a09099b8c4d..73b425dbe4464c4e710307728f57102b9713715e 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 b8f0b44d1fe3c967a379031f86bfebe088b99221..292c665a2b5afa4e452bb277d84f163adde9cad8 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 0e53814f443cc16b4381d83a11f30fdca6e66926..72b52ef92d50d84d2fc62e844cb760c796981ab3 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 b5e0b59ce725e765f421d805285a242bfc802105..e3a34342983862540e54aca62b83964213ed4933 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 d42d7c5d5a30b258459e1333a29489ba9c9e847d..80e6698ea44e306a403dfa8685c42ef93f2c1d00 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 6f4d7df93079e9fab65fd6ebfdb11ca253c998c3..cb9860642c0d6722ddcc00ce105ed26db748a539 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 2e74761913006599e9097854072126078dd6574c..ac99e671c24cd2ccc7edc0a995990319747f801d 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 d5444d4ea1aebdcccc0edce38b8396e53dda9822..3064abadd1a07602a2f016d9e727e499d2b90c70 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>