[prev in list] [next in list] [prev in thread] [next in thread] 

List:       glibc-cvs
Subject:    [glibc/release/2.34/master] _Static_assert needs two arguments for compatibility with GCC before 9
From:       Florian Weimer via Glibc-cvs <glibc-cvs () sourceware ! org>
Date:       2022-11-29 8:57:22
Message-ID: 20221129090421.54A663851898 () sourceware ! org
[Download RAW message or body]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a1c12fdf3f9b8665719835ce8330b3b2e2574b37

commit a1c12fdf3f9b8665719835ce8330b3b2e2574b37
Author: Florian Weimer <fweimer@redhat.com>
Date:   Fri Sep 10 13:18:36 2021 +0200

    _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>
    (cherry picked from commit c9fef4b7d1d0f2dad192c74f06102752247677a9)

Diff:
---
 include/sys/cdefs.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h
index 6a76160ed4..56adb231aa 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
[prev in list] [next in list] [prev in thread] [next in thread]