From: Carlos O'Donell Date: Fri, 10 Jun 2016 18:40:38 +0000 (-0400) Subject: Bug 20215: Always undefine __always_inline before defining it. X-Git-Tag: upstream/2.24~124 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e0835a5354aba6015648473a727823ea434a48e6;p=platform%2Fupstream%2Fglibc.git 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. --- diff --git a/ChangeLog b/ChangeLog index 34f51b5..fd2ea8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-06-09 Carlos O'Donell + + [BZ #20215] + * misc/sys/cdefs.h [__GNUC_PREREQ (3,2)]: Undef __always_inline first. + [!__GNUC_PREREQ (3,2)]: Likewise. + 2016-06-10 Adhemerval Zanela * conform/data/sys/socket.h-data (msghdr.msg_iovlen): Add xfail-. diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index 7fd4154..a3c2429 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