summaryrefslogtreecommitdiff
path: root/tools/include
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@redhat.com>2015-09-29 17:53:12 +0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2015-10-01 00:34:22 +0300
commit45633a169571e81835ec53fe0c089dd20f3195f1 (patch)
tree8079ac90dc0454d0d08a0d10398f85a5f5534a8c /tools/include
parent9c17dbc6eb73bdd8a6aaea1baefd37ff78d86148 (diff)
downloadlinux-45633a169571e81835ec53fe0c089dd20f3195f1.tar.xz
tools: Fix shadowed declaration in err.h
The error variable breaks build on CentOS 6.7, due to collision with global error symbol: CC util/evlist.o cc1: warnings being treated as errors In file included from util/evlist.c:28: tools/include/linux/err.h: In function ‘ERR_PTR’: tools/include/linux/err.h:34: error: declaration of ‘error’ shadows a global declaration util/util.h:135: error: shadowed declaration is here Using 'error_' name instead to fix it. Signed-off-by: Jiri Olsa <jolsa@kernel.org> Link: http://lkml.kernel.org/n/tip-i9mdgdbrgauy3fe76s9rd125@git.kernel.org Reported-by: Vinson Lee <vlee@twopensource.com> [ Use 'error_' instead of 'err' to, visually, not diverge too much from include/linux/err.h ] Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/include')
-rw-r--r--tools/include/linux/err.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/include/linux/err.h b/tools/include/linux/err.h
index c9ada48f5156..bdc3dd8131d4 100644
--- a/tools/include/linux/err.h
+++ b/tools/include/linux/err.h
@@ -31,9 +31,9 @@
#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
-static inline void * __must_check ERR_PTR(long error)
+static inline void * __must_check ERR_PTR(long error_)
{
- return (void *) error;
+ return (void *) error_;
}
static inline long __must_check PTR_ERR(__force const void *ptr)