qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Carlos O'Donell 2016-06-10 14:40:38 -04:00
parent 78880cc185
commit e0835a5354
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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-.

5
misc/sys/cdefs.h
View File

@ -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