Commit 195bcbf5 authored by Josh Boyer's avatar Josh Boyer Committed by Arnaldo Carvalho de Melo

perf tools: Fix build against newer glibc

Upstream glibc commit 295e904 added a definition for __attribute_const__
to cdefs.h.  This causes the following error when building perf:

util/include/linux/compiler.h:8:0: error: "__attribute_const__"
redefined [-Werror] /usr/include/sys/cdefs.h:226:0: note: this is the
location of the previous definition

Wrap __attribute_const__ in #ifndef as we do for __always_inline.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20110818113720.GL2227@zod.bos.redhat.comSigned-off-by: default avatarJosh Boyer <jwboyer@redhat.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 777d1d71
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
#define __always_inline inline #define __always_inline inline
#endif #endif
#define __user #define __user
#ifndef __attribute_const__
#define __attribute_const__ #define __attribute_const__
#endif
#define __used __attribute__((__unused__)) #define __used __attribute__((__unused__))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment