Merge branch 'master' into 'bugs-2706'

# Conflicts: # CMakeLists.txt

Merge branch 'master' into 'bugs-2706'
# Conflicts: # CMakeLists.txt
fa69d670 · dmitriy.gerasimov · c90d1ec2 · ddc0dddf · fa69d670
Commit fa69d670 authored 5 years ago by dmitriy.gerasimov
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,7 @@ set(DAP_STREAM_CH_SRCS dap_stream_ch.c dap_stream_ch_pkt.c dap_stream_ch_proc.c)
 if(WIN32)
  include_directories(../libdap/src/win32/)
-  include_directories(../3rdparty/libmemcached/)
+  include_directories(../3rdparty/wepoll/include/)
-  include_directories(../3rdparty/libmemcached/win32/)
  include_directories(../3rdparty/uthash/src/)
  include_directories(../3rdparty/libjson-c/)
  include_directories(../3rdparty/curl/include/)