espressif/mbedtls
1
0
Fork 0
mirror of https://github.com/espressif/mbedtls.git synced 2025-05-09 19:31:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Have MBEDTLS_STATIC_ASSERT() match current development more closely

Browse Source 
Signed-off-by: Tom Cosgrove <tom.cosgrove@arm.com>
This commit is contained in:
Tom Cosgrove 2023-03-14 12:03:47 +00:00
parent bdd01a74ef
commit 410594c002
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/common.h
View File

@ -349,7 +349,7 @@ static inline const unsigned char *mbedtls_buffer_offset_const(
#endif #endif
/* Always provide a static assert macro, so it can be used unconditionally. /* Always provide a static assert macro, so it can be used unconditionally.
* Note that it will expand to nothing on some systems. * It will expand to nothing on some systems.
* Can be used outside functions (but don't add a trailing ';' in that case: * Can be used outside functions (but don't add a trailing ';' in that case:
* the semicolon is included here to avoid triggering -Wextra-semi when * the semicolon is included here to avoid triggering -Wextra-semi when
* MBEDTLS_STATIC_ASSERT() expands to nothing). * MBEDTLS_STATIC_ASSERT() expands to nothing).
@ -358,22 +358,6 @@ static inline const unsigned char *mbedtls_buffer_offset_const(
*/ */
#if defined(static_assert) && !defined(__FreeBSD__) #if defined(static_assert) && !defined(__FreeBSD__)
#define MBEDTLS_STATIC_ASSERT(expr, msg) static_assert(expr, msg); #define MBEDTLS_STATIC_ASSERT(expr, msg) static_assert(expr, msg);
#elif defined(__COUNTER__)
/* gcc will say "size of array ‘mbedtls_static_assert_failedN’ is negative"
* (and with -pedantic will complain further);
* clang will say "'mbedtls_static_assert_failedN' declared as an array with a
* negative size";
* Visual Studio will just say "error C2118: negative subscript" (without the
* mbedtls_static_assert_failedN part)
*/
#if defined(__GNUC__)
#define MBEDTLS_UNUSED __attribute__((unused))
#else
#define MBEDTLS_UNUSED
#endif
#define MBEDTLS_STATIC_ASSERT2(expr, count) extern int MBEDTLS_UNUSED mbedtls_static_assert_failed ## count [2 * !!(expr) - 1];
#define MBEDTLS_STATIC_ASSERT1(expr, count) MBEDTLS_STATIC_ASSERT2(expr, count)
#define MBEDTLS_STATIC_ASSERT(expr, msg) MBEDTLS_STATIC_ASSERT1(expr, __COUNTER__)
#else #else
#define MBEDTLS_STATIC_ASSERT(expr, msg) #define MBEDTLS_STATIC_ASSERT(expr, msg)
#endif #endif