mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-11-27 05:50:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

setup_once.h cleanup and sync

Browse Source
This commit is contained in:
Yang Tse 2011-09-04 17:09:22 +02:00
parent 809cde5416
commit 196e0d699f
3 changed files with 51 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/setup.h
View File

@ -603,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 */

29
lib/setup_once.h
View File

@ -257,10 +257,13 @@ struct timeval {
#define ISPRINT(x) (isprint((int) ((unsigned char)x)))
#define ISUPPER(x) (isupper((int) ((unsigned char)x)))
#define ISLOWER(x) (islower((int) ((unsigned char)x)))
#define ISASCII(x) (isascii((int) ((unsigned char)x)))
#define ISBLANK(x) (int)((((unsigned char)x) == ' ') || \
(((unsigned char)x) == '\t'))
#define TOLOWER(x) (tolower((int) ((unsigned char)x)))
/*
* 'bool' exists on platforms with <stdbool.h>, i.e. C99 platforms.
@ -323,13 +326,6 @@ __pragma(warning(pop))
#endif
/*
* Definition of our NOP statement Object-like macro
*/
#define Curl_nop_stmt do { } WHILE_FALSE
/*
* Typedef to 'int' if sig_atomic_t is not an available 'typedefed' type.
*/
@ -367,7 +363,7 @@ typedef int sig_atomic_t;
#ifdef DEBUGBUILD
#define DEBUGF(x) x
#else
#define DEBUGF(x) Curl_nop_stmt
#define DEBUGF(x) do { } WHILE_FALSE
#endif
@ -378,7 +374,7 @@ typedef int sig_atomic_t;
#if defined(DEBUGBUILD) && defined(HAVE_ASSERT_H)
#define DEBUGASSERT(x) assert(x)
#else
#define DEBUGASSERT(x) Curl_nop_stmt
#define DEBUGASSERT(x) do { } WHILE_FALSE
#endif
@ -519,19 +515,4 @@ 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 */

23
src/setup.h
View File

@ -226,4 +226,27 @@ int fileno( FILE *stream);
#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_SRC_SETUP_H */