Skip to content
Snippets Groups Projects
Commit fedae323 authored by dmitriy.gerasimov's avatar dmitriy.gerasimov
Browse files

Merge branch 'bugs-2706' into 'master' 

wepoll issues

See merge request !4
parents 39f9f3f9 0d87304e
Branches master
No related tags found
1 merge request!4wepoll issues
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 1
− 0
View file @ fedae323
...@@ -10,6 +10,7 @@ if(WIN32) ...@@ -10,6 +10,7 @@ if(WIN32)
include_directories(../3rdparty/libjson-c/) include_directories(../3rdparty/libjson-c/)
include_directories(../3rdparty/curl/include/) include_directories(../3rdparty/curl/include/)
include_directories(../3rdparty/libsqlite3/) include_directories(../3rdparty/libsqlite3/)
#include_directories(../sources/wepoll/)
endif() endif()
add_library(${PROJECT_NAME} STATIC ${VPN_SRCS}) add_library(${PROJECT_NAME} STATIC ${VPN_SRCS})
......
dap_stream_ch_vpn.c
+ 0
− 3
View file @ fedae323
...@@ -46,14 +46,11 @@ ...@@ -46,14 +46,11 @@
#include <linux/if.h> #include <linux/if.h>
#include <linux/if_tun.h> #include <linux/if_tun.h>
#else #else
#undef _WIN32_WINNT
#define _WIN32_WINNT 0x0600
#include <winsock2.h> #include <winsock2.h>
#include <windows.h> #include <windows.h>
#include <mswsock.h> #include <mswsock.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <io.h> #include <io.h>
#include <wepoll.h>
#include <pthread.h> #include <pthread.h>
#include "win32/iphdr.h" #include "win32/iphdr.h"
#include "win32/ip.h" #include "win32/ip.h"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment