Commit f6272dd9 authored by Yang Tse's avatar Yang Tse
Browse files

BSD-style lwIP TCP/IP stack support - followup

parent 40597fd9

include/curl/curl.h

+1 −5
Original line number Diff line number Diff line
@@ -78,10 +78,6 @@ 
#include <sys/socket.h>

#endif



#if defined(__LWIP_OPT_H__)

#include <lwip/sockets.h>

#endif



#if !defined(WIN32) && !defined(__WATCOMC__) && !defined(__VXWORKS__)

#include <sys/time.h>

#endif
@@ -124,7 +120,7 @@ typedef void CURL; 


#ifndef curl_socket_typedef

/* socket typedef */

#ifdef WIN32

#if defined(WIN32) && !defined(__LWIP_OPT_H__)

typedef SOCKET curl_socket_t;

#define CURL_SOCKET_BAD INVALID_SOCKET

#else

lib/connect.c

+1 −1
Original line number Diff line number Diff line
@@ -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.

lib/setup_once.h

+16 −0
Original line number Diff line number Diff line
@@ -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 */

lib/config-win32.h

+1 −1

File changed.

Contains only whitespace changes.