From 267add1fb3d7e906d30eeb6843dde3838ea84e22 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Tue, 24 Sep 2024 17:14:33 -0500 Subject: [PATCH] wolfssl/wolfcrypt/types.h: in static_assert setup section, test for _MSVC_LANG >= 201103L alongside __cplusplus >= 201103L. --- wolfssl/wolfcrypt/types.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h index 6aacec3604..6ff0736220 100644 --- a/wolfssl/wolfcrypt/types.h +++ b/wolfssl/wolfcrypt/types.h @@ -1695,7 +1695,8 @@ typedef struct w64wrapper { #define WC_CPP_CAT_(a, b) a ## b #define WC_CPP_CAT(a, b) WC_CPP_CAT_(a, b) - #if defined(__cplusplus) && (__cplusplus >= 201103L) + #if (defined(__cplusplus) && (__cplusplus >= 201103L)) || \ + (defined(_MSVC_LANG) && (_MSVC_LANG >= 201103L)) #ifndef static_assert2 #define static_assert2 static_assert #endif