diff options
| author | Gisle Vanem <gvanem@yahoo.no> | 2015-12-07 14:27:29 -0500 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2015-12-07 14:27:55 -0500 |
| commit | e1b6b2219d2e5b44c50b9809a19321ee0d0c77db (patch) | |
| tree | ec78e53e1c801f1f34d85ecebb74a25f7600f35b /lib/memdebug.h | |
| parent | ec26399bf9c2b3dc6c68eb847530bfd669598e47 (diff) | |
| download | curl-e1b6b2219d2e5b44c50b9809a19321ee0d0c77db.tar.gz | |
lwip: Fix compatibility issues with later versions
The name of the header guard in lwIP's <lwip/opt.h> 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
Diffstat (limited to 'lib/memdebug.h')
| -rw-r--r-- | lib/memdebug.h | 1 |
1 files changed, 1 insertions, 0 deletions
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 */ |