diff options
Diffstat (limited to 'lib/setup.h')
| -rw-r--r-- | lib/setup.h | 40 |
1 files changed, 39 insertions, 1 deletions
diff --git a/lib/setup.h b/lib/setup.h index 1e96c76dd..84c9b1feb 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -251,6 +251,12 @@ # endif #endif +#ifdef USE_LWIPSOCK +# include <lwip/init.h> +# include <lwip/sockets.h> +# include <lwip/netdb.h> +#endif + #ifdef HAVE_EXTRA_STRICMP_H # include <extra/stricmp.h> #endif @@ -279,7 +285,6 @@ #ifdef HAVE_ASSERT_H #include <assert.h> #endif -#include <errno.h> #ifdef __TANDEM /* for nsr-tandem-nsk systems */ #include <floss.h> @@ -563,6 +568,7 @@ int netware_init(void); #define USE_HTTP_NEGOTIATE #endif +/* Single point where USE_NTLM definition might be done */ #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_NTLM) #if defined(USE_SSLEAY) || defined(USE_WINDOWS_SSPI) || \ defined(USE_GNUTLS) || defined(USE_NSS) @@ -580,6 +586,15 @@ int netware_init(void); #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) #endif +/* Provide a mechanism to silence picky compilers, such as gcc 4.6+. + Parameters should of course normally not be unused, but for example when we + have multiple implementations of the same interface it may happen. */ +#ifndef __GNUC__ +#define UNUSED_PARAM /*NOTHING*/ +#else +#define UNUSED_PARAM __attribute__((unused)) +#endif + /* * Include macros and defines that should only be processed once. */ @@ -588,4 +603,27 @@ int netware_init(void); #include "setup_once.h" #endif +/* + * Definition of our NOP statement Object-like macro + */ + +#ifndef Curl_nop_stmt +# define Curl_nop_stmt do { } WHILE_FALSE +#endif + +/* + * 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 /* HEADER_CURL_LIB_SETUP_H */ |