From e0835a5354aba6015648473a727823ea434a48e6 Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Fri, 10 Jun 2016 14:40:38 -0400 Subject: 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. --- misc/sys/cdefs.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'misc') 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 -- cgit 1.4.1