From e1b6b2219d2e5b44c50b9809a19321ee0d0c77db Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Mon, 7 Dec 2015 14:27:29 -0500 Subject: lwip: Fix compatibility issues with later versions The name of the header guard in lwIP's has changed from '__LWIP_OPT_H__' to 'LWIP_HDR_OPT_H' (bug #35874 in May 2015). Other fixes: - In curl_setup.h, the problem with an old PSDK doesn't apply if lwIP is used. - In memdebug.h, the 'socket' should be undefined first due to lwIP's lwip_socket() macro. - In curl_addrinfo.c lwIP's getaddrinfo() + freeaddrinfo() macros need special handling because they were undef'ed in memdebug.h. - In select.c we can't use preprocessor conditionals inside select if MSVC and select is a macro, as it is with lwIP. http://curl.haxx.se/mail/lib-2015-12/0023.html http://curl.haxx.se/mail/lib-2015-12/0024.html --- lib/memdebug.h | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/memdebug.h') diff --git a/lib/memdebug.h b/lib/memdebug.h index cfac1e077..8f2ffc240 100644 --- a/lib/memdebug.h +++ b/lib/memdebug.h @@ -103,6 +103,7 @@ CURL_EXTERN int curl_fclose(FILE *file, int line, const char *source); # endif #endif +#undef socket #define socket(domain,type,protocol)\ curl_socket(domain, type, protocol, __LINE__, __FILE__) #undef accept /* for those with accept as a macro */ -- cgit v1.2.1