Undef error codes before redefining them for WSA

Fixes compiler warnings about redefined macros from errno.h.
pull/3/head
Tobias Junghans 5 years ago
parent 343eaabd7c
commit 09b2ed4381

@ -41,6 +41,9 @@
#ifdef WIN32 #ifdef WIN32
#undef SOCKET #undef SOCKET
#include <winsock2.h> #include <winsock2.h>
#ifdef EWOULDBLOCK
#undef EWOULDBLOCK
#endif
#define EWOULDBLOCK WSAEWOULDBLOCK #define EWOULDBLOCK WSAEWOULDBLOCK
#define socklen_t int #define socklen_t int
#define close closesocket #define close closesocket

@ -40,6 +40,9 @@
#ifdef WIN32 #ifdef WIN32
#undef SOCKET #undef SOCKET
#include <winsock2.h> #include <winsock2.h>
#ifdef EWOULDBLOCK
#undef EWOULDBLOCK
#endif
#define EWOULDBLOCK WSAEWOULDBLOCK #define EWOULDBLOCK WSAEWOULDBLOCK
#define close closesocket #define close closesocket
#define read(sock,buf,len) recv(sock,buf,len,0) #define read(sock,buf,len) recv(sock,buf,len,0)

@ -109,7 +109,13 @@ int deny_severity=LOG_WARNING;
#pragma warning (disable: 4018 4761) #pragma warning (disable: 4018 4761)
#endif #endif
#define read(sock,buf,len) recv(sock,buf,len,0) #define read(sock,buf,len) recv(sock,buf,len,0)
#ifdef EWOULDBLOCK
#undef EWOULDBLOCK
#endif
#define EWOULDBLOCK WSAEWOULDBLOCK #define EWOULDBLOCK WSAEWOULDBLOCK
#ifdef ETIMEDOUT
#undef ETIMEDOUT
#endif
#define ETIMEDOUT WSAETIMEDOUT #define ETIMEDOUT WSAETIMEDOUT
#define write(sock,buf,len) send(sock,buf,len,0) #define write(sock,buf,len) send(sock,buf,len,0)
#else #else

Loading…
Cancel
Save