From 375a193ff43b330380ea69072955237ece6e5481 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Wed, 16 Dec 2015 19:51:12 +0800 Subject: [PATCH] windows fix wsapoll conflict on some toolchains After EmptyVoid at github https://github.com/warmcat/libwebsockets/issues/374 Signed-off-by: Andy Green --- lib/libwebsockets.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/libwebsockets.h b/lib/libwebsockets.h index af71d29c..4188d2c9 100644 --- a/lib/libwebsockets.h +++ b/lib/libwebsockets.h @@ -335,16 +335,18 @@ enum lws_callback_reasons { }; -#if defined(_WIN32) && (_WIN32_WINNT < 0x0600) +#if defined(_WIN32) typedef SOCKET lws_sockfd_type; typedef HANDLE lws_filefd_type; #define lws_sockfd_valid(sfd) (!!sfd) struct lws_pollfd { - lws_sockfd_type fd; - SHORT events; - SHORT revents; + lws_sockfd_type fd; + SHORT events; + SHORT revents; }; +#if (_WIN32_WINNT < 0x0600) WINSOCK_API_LINKAGE int WSAAPI WSAPoll(struct lws_pollfd fdArray[], ULONG fds, INT timeout); +#endif #else #if defined(MBED_OPERATORS)