From 80ec1decc49c72efec2a8b87c06245c92c0ab807 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 11 Feb 2021 18:11:46 +0100 Subject: New upstream version 1.29.90 --- shared/c-stdaux/src/c-stdaux.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'shared/c-stdaux/src') diff --git a/shared/c-stdaux/src/c-stdaux.h b/shared/c-stdaux/src/c-stdaux.h index 08d155ce..1cdbbbcf 100644 --- a/shared/c-stdaux/src/c-stdaux.h +++ b/shared/c-stdaux/src/c-stdaux.h @@ -84,7 +84,10 @@ extern "C" { * * Return: Evaluates to @_expr. */ -#define C_EXPR_ASSERT(_expr, _assertion, _message) \ +#if defined(__COVERITY__) // Coverity cannot const-fold __builtin_choose_expr() +# define C_EXPR_ASSERT(_expr, _assertion, _message) (_expr) +#else +# define C_EXPR_ASSERT(_expr, _assertion, _message) \ /* indentation and line-split to get better diagnostics */ \ (__builtin_choose_expr( \ !!(1 + 0 * sizeof( \ @@ -95,6 +98,7 @@ _Static_assert(_assertion, _message); \ (_expr), \ ((void)0) \ )) +#endif /** * C_STRINGIFY() - stringify a token, but evaluate it first -- cgit 1.3.0-6-gf8a5