Merge pull request #1181 from no92/static-asserts

options/internal: fix static asserts for pre-C++03
managarm · Oct 28, 2024 · ea90982 · ea90982
2 parents 1a53ea2 + 7accb84
commit ea90982
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/options/internal/include/bits/types.h b/options/internal/include/bits/types.h
@@ -324,11 +324,13 @@ typedef __SIZE_TYPE__    __mlibc_size;
 /* Sanity checking. Make sure that we agree with the compiler's ABI. */
 /* ---------------------------------------------------------------------------- */
 
-#if defined(__cpp_static_assert)
+#if defined(__cplusplus) && defined(__cpp_static_assert) && __cpp_static_assert >= 200410L
 #	define __MLIBC_STATIC_ASSERT(c, text) static_assert(c, text)
-#else
+#elif !defined(__cplusplus)
 /* _Static_assert is an extension in C89/C99. */
 #	define __MLIBC_STATIC_ASSERT(c, text) __extension__ _Static_assert(c, text)
+#else
+#	define __MLIBC_STATIC_ASSERT(c, text) extern int __static_assert_unavailable
 #endif
 
 #define __MLIBC_CHECK_TYPE(T1, T2) __MLIBC_STATIC_ASSERT(sizeof(T1) == sizeof(T2),\