From b8288038baed0fd71f5c19a6a41f12265a719aea Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Mon, 26 Aug 2013 14:55:00 -0400 Subject: [PATCH] Unconditionally use the WSA equivalents of Socket error constants. This change will only apply to mingw compilers, and has been found necessary by late versions of the mingw-w64 compiler. It's the same as what is done elsewhere for the Microsoft compilers. Backpatch of commit 73838b5251e. Problem reported by Michael Cronenworth, although not his patch. --- src/include/port/win32.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/include/port/win32.h b/src/include/port/win32.h index 34f40041298..6a40a322268 100644 --- a/src/include/port/win32.h +++ b/src/include/port/win32.h @@ -264,15 +264,25 @@ typedef int pid_t; #undef EINTR #define EINTR WSAEINTR #define EAGAIN WSAEWOULDBLOCK +#undef EMSGSIZE #define EMSGSIZE WSAEMSGSIZE +#undef EAFNOSUPPORT #define EAFNOSUPPORT WSAEAFNOSUPPORT +#undef EWOULDBLOCK #define EWOULDBLOCK WSAEWOULDBLOCK +#undef ECONNRESET #define ECONNRESET WSAECONNRESET +#undef EINPROGRESS #define EINPROGRESS WSAEINPROGRESS +#undef ENOBUFS #define ENOBUFS WSAENOBUFS +#undef EPROTONOSUPPORT #define EPROTONOSUPPORT WSAEPROTONOSUPPORT +#undef ECONNREFUSED #define ECONNREFUSED WSAECONNREFUSED +#undef EBADFD #define EBADFD WSAENOTSOCK +#undef EOPNOTSUPP #define EOPNOTSUPP WSAEOPNOTSUPP /* -- 2.47.2