From: Florian Weimer <fweimer@redhat.com>
Date: Fri, 10 Sep 2021 11:18:36 +0000 (+0200)
Subject: _Static_assert needs two arguments for compatibility with GCC before 9
X-Git-Tag: glibc-2.35~531
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9fef4b7d1d0f2dad192c74f06102752247677a9;p=thirdparty%2Fglibc.git

_Static_assert needs two arguments for compatibility with GCC before 9

This macro definition enforces two arguments even with newer compilers
that accept the single-argument form, too.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
---

diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h
index 6a76160ed4e..56adb231aa8 100644
--- a/include/sys/cdefs.h
+++ b/include/sys/cdefs.h
@@ -1,5 +1,12 @@
 #ifndef _SYS_CDEFS_H
 
+/* This is outside of _ISOMAC to enforce that _Static_assert always
+   uses the two-argument form.  This can be removed once the minimum
+   GCC version used to compile glibc is GCC 9.1.  */
+#ifndef __cplusplus
+# define _Static_assert(expr, diagnostic) _Static_assert (expr, diagnostic)
+#endif
+
 #include <misc/sys/cdefs.h>
 
 #ifndef _ISOMAC