Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-30 00:00:16 +01:00
Code Issues Releases Wiki Activity

windows fix wsapoll conflict on some toolchains

Browse source 
After EmptyVoid at github

https://github.com/warmcat/libwebsockets/issues/374

Signed-off-by: Andy Green <andy.green@linaro.org>
This commit is contained in:
Andy Green 2015-12-16 19:51:12 +08:00
parent 11c05bfa09
commit 375a193ff4
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/libwebsockets.h
View file

@ -335,16 +335,18 @@ enum lws_callback_reasons {
}; };
#if defined(_WIN32) && (_WIN32_WINNT < 0x0600) #if defined(_WIN32)
typedef SOCKET lws_sockfd_type; typedef SOCKET lws_sockfd_type;
typedef HANDLE lws_filefd_type; typedef HANDLE lws_filefd_type;
#define lws_sockfd_valid(sfd) (!!sfd) #define lws_sockfd_valid(sfd) (!!sfd)
struct lws_pollfd { struct lws_pollfd {
lws_sockfd_type fd; lws_sockfd_type fd;
SHORT events; SHORT events;
SHORT revents; SHORT revents;
}; };
#if (_WIN32_WINNT < 0x0600)
WINSOCK_API_LINKAGE int WSAAPI WSAPoll(struct lws_pollfd fdArray[], ULONG fds, INT timeout); WINSOCK_API_LINKAGE int WSAAPI WSAPoll(struct lws_pollfd fdArray[], ULONG fds, INT timeout);
#endif
#else #else
#if defined(MBED_OPERATORS) #if defined(MBED_OPERATORS)