Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 73838b5

Browse files
committed
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. If this doesn't upset older compilers in the buildfarm, it will be backpatched to 9.1. Problem reported by Michael Cronenworth, although not his patch.
1 parent b3cc173 commit 73838b5

File tree

1 file changed

+10
-20
lines changed

1 file changed

+10
-20
lines changed

src/include/port/win32.h

+10-20
Original file line numberDiff line numberDiff line change
@@ -272,36 +272,26 @@ typedef int pid_t;
272272
#undef EINTR
273273
#define EINTR WSAEINTR
274274
#define EAGAIN WSAEWOULDBLOCK
275-
#ifndef EMSGSIZE
275+
#undef EMSGSIZE
276276
#define EMSGSIZE WSAEMSGSIZE
277-
#endif
278-
#ifndef EAFNOSUPPORT
277+
#undef EAFNOSUPPORT
279278
#define EAFNOSUPPORT WSAEAFNOSUPPORT
280-
#endif
281-
#ifndef EWOULDBLOCK
279+
#undef EWOULDBLOCK
282280
#define EWOULDBLOCK WSAEWOULDBLOCK
283-
#endif
284-
#ifndef ECONNRESET
281+
#undef ECONNRESET
285282
#define ECONNRESET WSAECONNRESET
286-
#endif
287-
#ifndef EINPROGRESS
283+
#undef EINPROGRESS
288284
#define EINPROGRESS WSAEINPROGRESS
289-
#endif
290-
#ifndef ENOBUFS
285+
#undef ENOBUFS
291286
#define ENOBUFS WSAENOBUFS
292-
#endif
293-
#ifndef EPROTONOSUPPORT
287+
#undef EPROTONOSUPPORT
294288
#define EPROTONOSUPPORT WSAEPROTONOSUPPORT
295-
#endif
296-
#ifndef ECONNREFUSED
289+
#undef ECONNREFUSED
297290
#define ECONNREFUSED WSAECONNREFUSED
298-
#endif
299-
#ifndef EBADFD
291+
#undef EBADFD
300292
#define EBADFD WSAENOTSOCK
301-
#endif
302-
#ifndef EOPNOTSUPP
293+
#undef EOPNOTSUPP
303294
#define EOPNOTSUPP WSAEOPNOTSUPP
304-
#endif
305295

306296
/*
307297
* For Microsoft Visual Studio 2010 and above we intentionally redefine

0 commit comments

Comments
 (0)