From b9111aae991fa33001fcc7c6ae9cd8519a9c0182 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Fri, 14 Mar 2025 02:11:58 -0500 Subject: [PATCH] wolfssl/wolfcrypt/types.h: refactor assert.h gate as WOLFSSL_HAVE_ASSERT_H && !WOLFSSL_NO_ASSERT_H. wolfssl/wolfcrypt/settings.h: #ifdef WOLFSSL_LINUXKM, #undef WOLFSSL_HAVE_ASSERT_H and #define WOLFSSL_NO_ASSERT_H. --- wolfssl/wolfcrypt/settings.h | 2 ++ wolfssl/wolfcrypt/types.h | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 2688960d1..03d402a2c 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -3611,6 +3611,8 @@ extern void uITRON4_free(void *p) ; #undef HAVE_ATEXIT #undef WOLFSSL_HAVE_MIN #undef WOLFSSL_HAVE_MAX + #undef WOLFSSL_HAVE_ASSERT_H + #define WOLFSSL_NO_ASSERT_H #define SIZEOF_LONG 8 #define SIZEOF_LONG_LONG 8 #define CHAR_BIT 8 diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h index d01bbd9fc..ba3580259 100644 --- a/wolfssl/wolfcrypt/types.h +++ b/wolfssl/wolfcrypt/types.h @@ -1808,9 +1808,7 @@ typedef struct w64wrapper { #define wc_static_assert(expr) struct wc_static_assert_dummy_struct #define wc_static_assert2(expr, msg) wc_static_assert(expr) #elif !defined(wc_static_assert) - #if defined(WOLFSSL_HAVE_ASSERT_H) || \ - (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \ - (defined(__cplusplus) && (__cplusplus >= 201103L)) + #if defined(WOLFSSL_HAVE_ASSERT_H) && !defined(WOLFSSL_NO_ASSERT_H) #include #endif #if (defined(__cplusplus) && (__cplusplus >= 201703L)) || \