From 81239edb89add9327d2b03105c9981d092e16ace Mon Sep 17 00:00:00 2001 From: Tanguy Fautre Date: Thu, 20 May 2010 22:40:48 +0200 Subject: [PATCH] build: allow curl to build with Microsoft VC10 By undefing a bunch of E* defines that VC10 has started to define but that we redefine internally to their WSA* alternatives when building for Windows. --- CHANGES | 3 +++ lib/setup_once.h | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/CHANGES b/CHANGES index 9e4ec8e59..4c512bcd2 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,9 @@ Changelog +Daniel Stenberg (20 May 2010) +- Tanguy Fautre brought a fix to allow curl to build with Microsoft VC10. + Daniel Stenberg (18 May 2010) - Eric Mertens posted bug report #3003005 pointing out that the libcurl TFTP code was not sending the timeout option properly to the server, and diff --git a/lib/setup_once.h b/lib/setup_once.h index 473eef2b7..cdc0ecf64 100644 --- a/lib/setup_once.h +++ b/lib/setup_once.h @@ -373,38 +373,63 @@ typedef int sig_atomic_t; #define EINTR WSAEINTR #undef EINVAL /* override definition in errno.h */ #define EINVAL WSAEINVAL +#undef EWOULDBLOCK /* override definition in errno.h */ #define EWOULDBLOCK WSAEWOULDBLOCK +#undef EINPROGRESS /* override definition in errno.h */ #define EINPROGRESS WSAEINPROGRESS +#undef EALREADY /* override definition in errno.h */ #define EALREADY WSAEALREADY +#undef ENOTSOCK /* override definition in errno.h */ #define ENOTSOCK WSAENOTSOCK +#undef EDESTADDRREQ /* override definition in errno.h */ #define EDESTADDRREQ WSAEDESTADDRREQ +#undef EMSGSIZE /* override definition in errno.h */ #define EMSGSIZE WSAEMSGSIZE +#undef EPROTOTYPE /* override definition in errno.h */ #define EPROTOTYPE WSAEPROTOTYPE +#undef ENOPROTOOPT /* override definition in errno.h */ #define ENOPROTOOPT WSAENOPROTOOPT +#undef EPROTONOSUPPORT /* override definition in errno.h */ #define EPROTONOSUPPORT WSAEPROTONOSUPPORT #define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT +#undef EOPNOTSUPP /* override definition in errno.h */ #define EOPNOTSUPP WSAEOPNOTSUPP #define EPFNOSUPPORT WSAEPFNOSUPPORT +#undef EAFNOSUPPORT /* override definition in errno.h */ #define EAFNOSUPPORT WSAEAFNOSUPPORT +#undef EADDRINUSE /* override definition in errno.h */ #define EADDRINUSE WSAEADDRINUSE +#undef EADDRNOTAVAIL /* override definition in errno.h */ #define EADDRNOTAVAIL WSAEADDRNOTAVAIL +#undef ENETDOWN /* override definition in errno.h */ #define ENETDOWN WSAENETDOWN +#undef ENETUNREACH /* override definition in errno.h */ #define ENETUNREACH WSAENETUNREACH +#undef ENETRESET /* override definition in errno.h */ #define ENETRESET WSAENETRESET +#undef ECONNABORTED /* override definition in errno.h */ #define ECONNABORTED WSAECONNABORTED +#undef ECONNRESET /* override definition in errno.h */ #define ECONNRESET WSAECONNRESET +#undef ENOBUFS /* override definition in errno.h */ #define ENOBUFS WSAENOBUFS +#undef EISCONN /* override definition in errno.h */ #define EISCONN WSAEISCONN +#undef ENOTCONN /* override definition in errno.h */ #define ENOTCONN WSAENOTCONN #define ESHUTDOWN WSAESHUTDOWN #define ETOOMANYREFS WSAETOOMANYREFS +#undef ETIMEDOUT /* override definition in errno.h */ #define ETIMEDOUT WSAETIMEDOUT +#undef ECONNREFUSED /* override definition in errno.h */ #define ECONNREFUSED WSAECONNREFUSED +#undef ELOOP /* override definition in errno.h */ #define ELOOP WSAELOOP #ifndef ENAMETOOLONG /* possible previous definition in errno.h */ #define ENAMETOOLONG WSAENAMETOOLONG #endif #define EHOSTDOWN WSAEHOSTDOWN +#undef EHOSTUNREACH /* override definition in errno.h */ #define EHOSTUNREACH WSAEHOSTUNREACH #ifndef ENOTEMPTY /* possible previous definition in errno.h */ #define ENOTEMPTY WSAENOTEMPTY