mirror of
https://github.com/curl/curl.git
synced 2026-08-25 16:43:39 +03:00
build: Disable Visual Studio warning "conditional expression is constant"
- Disable warning C4127 "conditional expression is constant" globally
in curl_setup.h for when building with Microsoft's compiler.
This mainly affects building with the Visual Studio project files found
in the projects dir.
Prior to this change the cmake and winbuild build systems already
disabled 4127 globally for when building with Microsoft's compiler.
Also, 4127 was already disabled for all build systems in the limited
circumstance of the WHILE_FALSE macro which disabled the warning
specifically for while(0). This commit removes the WHILE_FALSE macro and
all other cruft in favor of disabling globally in curl_setup.
Background:
We have various macros that cause 0 or 1 to be evaluated, which would
cause warning C4127 in Visual Studio. For example this causes it:
#define Curl_resolver_asynch() 1
Full behavior is not clearly defined and inconsistent across versions.
However it is documented that since VS 2015 Update 3 Microsoft has
addressed this somewhat but not entirely, not warning on while(true) for
example.
Prior to this change some C4127 warnings occurred when I built with
Visual Studio using the generated projects in the projects dir.
Closes https://github.com/curl/curl/pull/4658
This commit is contained in:
parent
0436d4438a
commit
9c1806ae46
32 changed files with 76 additions and 121 deletions
|
|
@ -38,33 +38,6 @@
|
|||
|
||||
#include "memdebug.h" /* keep this as LAST include */
|
||||
|
||||
/*
|
||||
* Macros ALWAYS_TRUE and ALWAYS_FALSE are used to avoid compiler warnings.
|
||||
*/
|
||||
|
||||
#define ALWAYS_TRUE (1)
|
||||
#define ALWAYS_FALSE (0)
|
||||
|
||||
#if defined(_MSC_VER) && !defined(__POCC__)
|
||||
# undef ALWAYS_TRUE
|
||||
# undef ALWAYS_FALSE
|
||||
# if (_MSC_VER < 1500)
|
||||
# define ALWAYS_TRUE (0, 1)
|
||||
# define ALWAYS_FALSE (1, 0)
|
||||
# else
|
||||
# define ALWAYS_TRUE \
|
||||
__pragma(warning(push)) \
|
||||
__pragma(warning(disable:4127)) \
|
||||
(1) \
|
||||
__pragma(warning(pop))
|
||||
# define ALWAYS_FALSE \
|
||||
__pragma(warning(push)) \
|
||||
__pragma(warning(disable:4127)) \
|
||||
(0) \
|
||||
__pragma(warning(pop))
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef WIN32
|
||||
# undef PATH_MAX
|
||||
# define PATH_MAX MAX_PATH
|
||||
|
|
@ -79,9 +52,9 @@ __pragma(warning(pop))
|
|||
#endif
|
||||
|
||||
#ifdef WIN32
|
||||
# define _use_lfn(f) ALWAYS_TRUE /* long file names always available */
|
||||
# define _use_lfn(f) (1) /* long file names always available */
|
||||
#elif !defined(__DJGPP__) || (__DJGPP__ < 2) /* DJGPP 2.0 has _use_lfn() */
|
||||
# define _use_lfn(f) ALWAYS_FALSE /* long file names never available */
|
||||
# define _use_lfn(f) (0) /* long file names never available */
|
||||
#elif defined(__DJGPP__)
|
||||
# include <fcntl.h> /* _use_lfn(f) prototype */
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ CURLcode easysrc_addf(struct slist_wc **plist, const char *fmt, ...)
|
|||
return ret;
|
||||
}
|
||||
|
||||
#define CHKRET(v) do {CURLcode ret = (v); if(ret) return ret;} WHILE_FALSE
|
||||
#define CHKRET(v) do {CURLcode ret = (v); if(ret) return ret;} while(0)
|
||||
|
||||
CURLcode easysrc_init(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
if(!(*(str))) \
|
||||
return PARAM_NO_MEM; \
|
||||
} \
|
||||
} WHILE_FALSE
|
||||
} while(0)
|
||||
|
||||
struct LongShort {
|
||||
const char *letter; /* short name option */
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ struct win32_crypto_hash {
|
|||
*(str) = strdup((val)); \
|
||||
if(!(val)) \
|
||||
return PARAM_NO_MEM; \
|
||||
} WHILE_FALSE
|
||||
} while(0)
|
||||
|
||||
#if defined(USE_OPENSSL)
|
||||
/* Functions are already defined */
|
||||
|
|
|
|||
|
|
@ -181,18 +181,18 @@ static const NameValue setopt_nv_CURLNONZERODEFAULTS[] = {
|
|||
ret = easysrc_add args; \
|
||||
if(ret) \
|
||||
goto nomem; \
|
||||
} WHILE_FALSE
|
||||
} while(0)
|
||||
#define ADDF(args) do { \
|
||||
ret = easysrc_addf args; \
|
||||
if(ret) \
|
||||
goto nomem; \
|
||||
} WHILE_FALSE
|
||||
} while(0)
|
||||
#define NULL_CHECK(p) do { \
|
||||
if(!p) { \
|
||||
ret = CURLE_OUT_OF_MEMORY; \
|
||||
goto nomem; \
|
||||
} \
|
||||
} WHILE_FALSE
|
||||
} while(0)
|
||||
|
||||
#define DECL0(s) ADD((&easysrc_decl, s))
|
||||
#define DECL1(f,a) ADDF((&easysrc_decl, f,a))
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
if(result) \
|
||||
break; \
|
||||
} \
|
||||
} WHILE_FALSE
|
||||
} while(0)
|
||||
|
||||
/* allow removed features to simulate success: */
|
||||
bool tool_setopt_skip(CURLoption tag);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue