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 /include | |
| 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 'include')
| -rw-r--r-- | include/curl/curl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/curl/curl.h b/include/curl/curl.h index 26d178e13..7fd533e51 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -56,7 +56,8 @@ #include <time.h> #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) -#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H) || defined(__LWIP_OPT_H__)) +#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H) || \ + defined(__LWIP_OPT_H__) || defined(LWIP_HDR_OPT_H)) /* The check above prevents the winsock2 inclusion if winsock.h already was included, since they can't co-exist without problems */ #include <winsock2.h> @@ -112,7 +113,7 @@ typedef void CURL; #ifndef curl_socket_typedef /* socket typedef */ -#if defined(WIN32) && !defined(__LWIP_OPT_H__) +#if defined(WIN32) && !defined(__LWIP_OPT_H__) && !defined(LWIP_HDR_OPT_H) typedef SOCKET curl_socket_t; #define CURL_SOCKET_BAD INVALID_SOCKET #else |