diff --git a/lib/libwebsockets.h b/lib/libwebsockets.h index 4c168d77..48cdeb2a 100644 --- a/lib/libwebsockets.h +++ b/lib/libwebsockets.h @@ -105,12 +105,6 @@ extern "C" { #include "lws_config.h" #if defined(WIN32) || defined(_WIN32) -#if (WINVER < 0x0600) -#undef WINVER -#undef _WIN32_WINNT -#define WINVER 0x0600 -#define _WIN32_WINNT WINVER -#endif #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif diff --git a/lib/private-libwebsockets.h b/lib/private-libwebsockets.h index a30fd585..1760ec6f 100644 --- a/lib/private-libwebsockets.h +++ b/lib/private-libwebsockets.h @@ -66,6 +66,7 @@ #define lws_socket_is_valid(x) (!!x) #define LWS_SOCK_INVALID 0 #include +#include #include #include #ifdef LWS_HAVE_IN6ADDR_H diff --git a/test-server/test-server.h b/test-server/test-server.h index 30bc634f..7a8a9223 100644 --- a/test-server/test-server.h +++ b/test-server/test-server.h @@ -1,3 +1,9 @@ +#if defined(_WIN32) && defined(EXTERNAL_POLL) +#define WINVER 0x0600 +#define _WIN32_WINNT 0x0600 +#define poll(fdArray, fds, timeout) WSAPoll((LPWSAPOLLFD)(fdArray), (ULONG)(fds), (INT)(timeout)) +#endif + #include "lws_config.h" #include @@ -13,9 +19,6 @@ #ifdef _WIN32 #include -#ifdef EXTERNAL_POLL -#define poll WSAPoll -#endif #include "gettimeofday.h" #else #include