moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 03:55:03 -05:00
Code Issues Releases Wiki Activity

BSD-style lwIP TCP/IP stack support - followup

Browse Source
This commit is contained in:
Yang Tse 2011-08-05 15:42:05 +02:00
parent 40597fd942
commit f6272dd9b8
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/curl/curl.h
View File

@ -78,10 +78,6 @@
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
#if defined(__LWIP_OPT_H__)
#include <lwip/sockets.h>
#endif
#if !defined(WIN32) && !defined(__WATCOMC__) && !defined(__VXWORKS__) #if !defined(WIN32) && !defined(__WATCOMC__) && !defined(__VXWORKS__)
#include <sys/time.h> #include <sys/time.h>
#endif #endif
@ -124,7 +120,7 @@ typedef void CURL;
#ifndef curl_socket_typedef #ifndef curl_socket_typedef
/* socket typedef */ /* socket typedef */
#ifdef WIN32 #if defined(WIN32) && !defined(__LWIP_OPT_H__)
typedef SOCKET curl_socket_t; typedef SOCKET curl_socket_t;
#define CURL_SOCKET_BAD INVALID_SOCKET #define CURL_SOCKET_BAD INVALID_SOCKET
#else #else

2
lib/connect.c
View File

@ -792,7 +792,7 @@ static void nosigpipe(struct connectdata *conn,
#define nosigpipe(x,y) #define nosigpipe(x,y)
#endif #endif
#ifdef WIN32 #ifdef USE_WINSOCK
/* When you run a program that uses the Windows Sockets API, you may /* When you run a program that uses the Windows Sockets API, you may
experience slow performance when you copy data to a TCP server. experience slow performance when you copy data to a TCP server.

16
lib/setup_once.h
View File

@ -490,5 +490,21 @@ typedef int sig_atomic_t;
#define ZERO_NULL 0 #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 */ #endif /* __SETUP_ONCE_H */