aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--misc/sys/cdefs.h5
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 34f51b5890..fd2ea8ae08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-06-09 Carlos O'Donell <carlos@redhat.com>
+
+ [BZ #20215]
+ * misc/sys/cdefs.h [__GNUC_PREREQ (3,2)]: Undef __always_inline first.
+ [!__GNUC_PREREQ (3,2)]: Likewise.
+
2016-06-10 Adhemerval Zanela <adhemerval.zanella@linaro.org>
* conform/data/sys/socket.h-data (msghdr.msg_iovlen): Add xfail-.
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index 7fd41549db..a3c2429b32 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -304,8 +304,13 @@
/* Forces a function to be always inlined. */
#if __GNUC_PREREQ (3,2)
+/* The Linux kernel defines __always_inline in stddef.h (283d7573), and
+ it conflicts with this definition. Therefore undefine it first to
+ allow either header to be included first. */
+# undef __always_inline
# define __always_inline __inline __attribute__ ((__always_inline__))
#else
+# undef __always_inline
# define __always_inline __inline
#endif