From e53df5b07ea4e84ebfe8dbb08b358c1c4fd5fc90 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Sun, 21 Jul 2024 10:08:01 +0200 Subject: [PATCH] stdinc: c23 deprecated _Static_assert in favor of static_assert (cherry picked from commit 22bfbdbc020bf42622bbeb1e70df6cd2a692136f) (cherry picked from commit 5d606eaae27311a36ff48437a7235a38e3525608) --- include/SDL_stdinc.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/SDL_stdinc.h b/include/SDL_stdinc.h index 45e2a7830a..8b94ecb284 100644 --- a/include/SDL_stdinc.h +++ b/include/SDL_stdinc.h @@ -376,10 +376,8 @@ typedef uint64_t Uint64; #endif /* SDL_DISABLE_ANALYZE_MACROS */ #ifndef SDL_COMPILE_TIME_ASSERT -#if defined(__cplusplus) -#if (__cplusplus >= 201103L) +#if (defined(__cplusplus) && __cplusplus >= 201103L) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L) #define SDL_COMPILE_TIME_ASSERT(name, x) static_assert(x, #x) -#endif #elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) #define SDL_COMPILE_TIME_ASSERT(name, x) _Static_assert(x, #x) #endif