Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8607c1ee authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools include: Move ARRAY_SIZE() to linux/kernel.h 

To match the kernel, then look for places redefining it to make it use
this version, which checks that its parameter is an array at build time.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-txlcf1im83bcbj6kh0wxmyy8@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent f6441aff

tools/include/linux/kernel.h

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <stdarg.h>

#include <stddef.h>

#include <assert.h>

#include <linux/compiler.h>



#ifndef UINT_MAX

#define UINT_MAX	(~0U)
@@ -76,6 +77,8 @@ 
int vscnprintf(char *buf, size_t size, const char *fmt, va_list args);

int scnprintf(char * buf, size_t size, const char * fmt, ...);



#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))



/*

 * This looks more complex than it should be. But we need to

 * get the type for the ~ right in round_down (it needs to be

tools/perf/util/util.h

+0 −2
Original line number Diff line number Diff line 
#ifndef GIT_COMPAT_UTIL_H

#define GIT_COMPAT_UTIL_H



#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))



#ifdef __GNUC__

#define TYPEOF(x) (__typeof__(x))

#else