summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@redhat.com>2016-06-10 14:40:38 -0400
committerCarlos O'Donell <carlos@redhat.com>2016-06-10 15:09:12 -0400
commite0835a5354aba6015648473a727823ea434a48e6 (patch)
tree7498d77fff23f65fb9df4030b98855f2fdb323f7 /ChangeLog
parent78880cc185dc521855a58001a28e3059722d8e85 (diff)
downloadglibc-e0835a5354aba6015648473a727823ea434a48e6.tar.gz
Bug 20215: Always undefine __always_inline before defining it.
The Linux kernel defines __always_inline in stddef.h (283d7573), and it conflicts with the definition in misc/sys/cdefs.h. To fix this we undefine it first and always use the glibc definition.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 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-.