diff options
| author | Brian Curtin <brian@python.org> | 2012-05-13 16:19:23 (GMT) |
|---|---|---|
| committer | Brian Curtin <brian@python.org> | 2012-05-13 16:19:23 (GMT) |
| commit | 401f9f3d32dcebf5ead8079d46a83fe7c7631581 (patch) | |
| tree | 899600f4dad86565fd3585499e2332d2a3599d42 /Objects | |
| parent | 708d88c33441b29760b9246d61844eb59c1d0f3a (diff) | |
| download | cpython-401f9f3d32dcebf5ead8079d46a83fe7c7631581.zip cpython-401f9f3d32dcebf5ead8079d46a83fe7c7631581.tar.gz cpython-401f9f3d32dcebf5ead8079d46a83fe7c7631581.tar.bz2 | |
Fix #13210. Port the Windows build from VS2008 to VS2010.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/exceptions.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/Objects/exceptions.c b/Objects/exceptions.c index a2f2e44..a11283e 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -2317,6 +2317,34 @@ PyObject *PyExc_RecursionErrorInst = NULL; #ifdef MS_WINDOWS #include <Winsock2.h> +/* The following constants were added to errno.h in VS2010 but have + preferred WSA equivalents. */ +#undef EADDRINUSE +#undef EADDRNOTAVAIL +#undef EAFNOSUPPORT +#undef EALREADY +#undef ECONNABORTED +#undef ECONNREFUSED +#undef ECONNRESET +#undef EDESTADDRREQ +#undef EHOSTUNREACH +#undef EINPROGRESS +#undef EISCONN +#undef ELOOP +#undef EMSGSIZE +#undef ENETDOWN +#undef ENETRESET +#undef ENETUNREACH +#undef ENOBUFS +#undef ENOPROTOOPT +#undef ENOTCONN +#undef ENOTSOCK +#undef EOPNOTSUPP +#undef EPROTONOSUPPORT +#undef EPROTOTYPE +#undef ETIMEDOUT +#undef EWOULDBLOCK + #if defined(WSAEALREADY) && !defined(EALREADY) #define EALREADY WSAEALREADY #endif |