c6d234
Fix -Wundef warning around the definition of max_align_t.  Updates
c6d234
glibc-rh1418978-max_align_t.patch.  Upstream assumes C11 support and
c6d234
therefore does not need this definition.
c6d234
c6d234
diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h
c6d234
index 29da941991f9a206..25ff204e4c632865 100644
c6d234
--- a/include/sys/cdefs.h
c6d234
+++ b/include/sys/cdefs.h
c6d234
@@ -20,7 +20,8 @@ rtld_hidden_proto (__chk_fail)
c6d234
    is also available in C99 mode.  The aligned attributes are required
c6d234
    because some ABIs have reduced alignment requirements for struct and
c6d234
    union members.  */
c6d234
-#if __STDC_VERSION__ < 201112L && __cplusplus < 201103L
c6d234
+#if (!defined (__STDC_VERSION__) || __STDC_VERSION__ < 201112L) \
c6d234
+  && (!defined (__cplusplus) || __cplusplus < 201103L)
c6d234
 typedef struct {
c6d234
   long long ll __attribute__ ((__aligned__ (__alignof__ (long long))));
c6d234
   long double ld __attribute__ ((__aligned__ (__alignof__ (long double))));