Skip to content

Commit b9111aa

Browse files
committed
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.
1 parent 87c0ac9 commit b9111aa

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

wolfssl/wolfcrypt/settings.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3611,6 +3611,8 @@ extern void uITRON4_free(void *p) ;
36113611
#undef HAVE_ATEXIT
36123612
#undef WOLFSSL_HAVE_MIN
36133613
#undef WOLFSSL_HAVE_MAX
3614+
#undef WOLFSSL_HAVE_ASSERT_H
3615+
#define WOLFSSL_NO_ASSERT_H
36143616
#define SIZEOF_LONG 8
36153617
#define SIZEOF_LONG_LONG 8
36163618
#define CHAR_BIT 8

wolfssl/wolfcrypt/types.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,9 +1808,7 @@ typedef struct w64wrapper {
18081808
#define wc_static_assert(expr) struct wc_static_assert_dummy_struct
18091809
#define wc_static_assert2(expr, msg) wc_static_assert(expr)
18101810
#elif !defined(wc_static_assert)
1811-
#if defined(WOLFSSL_HAVE_ASSERT_H) || \
1812-
(defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \
1813-
(defined(__cplusplus) && (__cplusplus >= 201103L))
1811+
#if defined(WOLFSSL_HAVE_ASSERT_H) && !defined(WOLFSSL_NO_ASSERT_H)
18141812
#include <assert.h>
18151813
#endif
18161814
#if (defined(__cplusplus) && (__cplusplus >= 201703L)) || \

0 commit comments

Comments
 (0)