diff options
| author | Yang Tse <yangsita@gmail.com> | 2011-09-03 16:06:10 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2011-09-03 16:07:09 +0200 |
| commit | 6b75d2c2df7209919a70a29a4479625b62fb3c28 (patch) | |
| tree | a5b2bd4195db4cb69f3299814e910bd04ebb6eac /lib/setup_once.h | |
| parent | 2be65bb0c5317b6821882b41558bd8cd2eb64d25 (diff) | |
fix a bunch of MSVC compiler warnings
Diffstat (limited to 'lib/setup_once.h')
| -rw-r--r-- | lib/setup_once.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/lib/setup_once.h b/lib/setup_once.h index 63a3698de..64cfeeaac 100644 --- a/lib/setup_once.h +++ b/lib/setup_once.h @@ -1,5 +1,5 @@ -#ifndef __SETUP_ONCE_H -#define __SETUP_ONCE_H +#ifndef HEADER_CURL_SETUP_ONCE_H +#define HEADER_CURL_SETUP_ONCE_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -324,6 +324,13 @@ __pragma(warning(pop)) /* + * 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. */ @@ -360,7 +367,7 @@ typedef int sig_atomic_t; #ifdef DEBUGBUILD #define DEBUGF(x) x #else -#define DEBUGF(x) do { } WHILE_FALSE +#define DEBUGF(x) Curl_nop_stmt #endif @@ -371,7 +378,7 @@ typedef int sig_atomic_t; #if defined(DEBUGBUILD) && defined(HAVE_ASSERT_H) #define DEBUGASSERT(x) assert(x) #else -#define DEBUGASSERT(x) do { } WHILE_FALSE +#define DEBUGASSERT(x) Curl_nop_stmt #endif @@ -527,5 +534,4 @@ typedef int sig_atomic_t; # endif #endif -#endif /* __SETUP_ONCE_H */ - +#endif /* HEADER_CURL_SETUP_ONCE_H */ |