summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-08-18 15:37:21 +0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2011-08-18 14:24:53 +0400
commit195bcbf5078d74c8e00d68f04eb8695196fb31e8 (patch)
tree16be79165faf9f56dfa93bcb96ae634c6582db91 /tools
parent777d1d71db622a5e1ff703495741c3d257b532e5 (diff)
downloadlinux-195bcbf5078d74c8e00d68f04eb8695196fb31e8.tar.xz
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.com Signed-off-by: Josh Boyer <jwboyer@redhat.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/include/linux/compiler.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h
index 791f9dd27ebf..547628e97f3d 100644
--- a/tools/perf/util/include/linux/compiler.h
+++ b/tools/perf/util/include/linux/compiler.h
@@ -5,7 +5,9 @@
#define __always_inline inline
#endif
#define __user
+#ifndef __attribute_const__
#define __attribute_const__
+#endif
#define __used __attribute__((__unused__))