diff options
| author | Yang Tse <yangsita@gmail.com> | 2011-08-05 15:42:05 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2011-08-05 15:53:00 +0200 |
| commit | f6272dd9b8ae8d188068aeb0df2af496a964e407 (patch) | |
| tree | 6266a7dff6a9a54171a58f0ef31520b40abebb93 /lib | |
| parent | 40597fd942914960b068e5ed5796abc7b5a500dc (diff) | |
| download | curl-f6272dd9b8ae8d188068aeb0df2af496a964e407.tar.gz | |
BSD-style lwIP TCP/IP stack support - followup
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/config-win32.h | 2 | ||||
| -rw-r--r-- | lib/connect.c | 2 | ||||
| -rw-r--r-- | lib/setup_once.h | 16 |
3 files changed, 18 insertions, 2 deletions
diff --git a/lib/config-win32.h b/lib/config-win32.h index 8c4719745..1179b1588 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -407,7 +407,7 @@ /* BSD-style lwIP TCP/IP stack SPECIFIC */ /* ---------------------------------------------------------------- */ -/* Define this to use BSD-style lwIP TCP/IP stack */ +/* Define this to use BSD-style lwIP TCP/IP stack */ /* #define USE_LWIPSOCK 1 */ #ifdef USE_LWIPSOCK diff --git a/lib/connect.c b/lib/connect.c index 1f802bda8..9301f0108 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -792,7 +792,7 @@ static void nosigpipe(struct connectdata *conn, #define nosigpipe(x,y) #endif -#ifdef WIN32 +#ifdef USE_WINSOCK /* When you run a program that uses the Windows Sockets API, you may experience slow performance when you copy data to a TCP server. diff --git a/lib/setup_once.h b/lib/setup_once.h index 751102bed..4f7d0d791 100644 --- a/lib/setup_once.h +++ b/lib/setup_once.h @@ -490,5 +490,21 @@ typedef int sig_atomic_t; #define ZERO_NULL 0 + +/* + * Ensure that Winsock and lwIP TCP/IP stacks are not mixed. + */ + +#if defined(__LWIP_OPT_H__) +# if defined(SOCKET) || \ + defined(USE_WINSOCK) || \ + defined(HAVE_ERRNO_H) || \ + defined(HAVE_WINSOCK_H) || \ + defined(HAVE_WINSOCK2_H) || \ + defined(HAVE_WS2TCPIP_H) +# error "Winsock and lwIP TCP/IP stack definitions shall not coexist!" +# endif +#endif + #endif /* __SETUP_ONCE_H */ |