Merge pull request #8013 from douzzer/20240924-static_assert-MSVC

20240924-static_assert-MSVC
wolfSSL · Sep 25, 2024 · efd4127 · efd4127
2 parents 79b5ec8 + 267add1
commit efd4127
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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