diff options
| author | Alexander Alemayhu <alexander@alemayhu.com> | 2017-04-24 15:31:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-24 16:20:19 -0400 |
| commit | dfc5be0dc0f83e70919a8ec59c122709a30f791e (patch) | |
| tree | 4b0596fa9a3b85d68e756374256887996a50f66b /samples | |
| parent | 4784726f69ffa3e076d502a5885d753ccb24a82d (diff) | |
| download | linux-stable-dfc5be0dc0f83e70919a8ec59c122709a30f791e.tar.gz linux-stable-dfc5be0dc0f83e70919a8ec59c122709a30f791e.tar.bz2 linux-stable-dfc5be0dc0f83e70919a8ec59c122709a30f791e.zip | |
samples/bpf: check before defining offsetof
Fixes the following warning
samples/bpf/test_lru_dist.c:28:0: warning: "offsetof" redefined
#define offsetof(TYPE, MEMBER) ((size_t)&((TYPE *)0)->MEMBER)
In file included from ./tools/lib/bpf/bpf.h:25:0,
from samples/bpf/libbpf.h:5,
from samples/bpf/test_lru_dist.c:24:
/usr/lib/gcc/x86_64-redhat-linux/6.3.1/include/stddef.h:417:0: note: this is the location of the previous definition
#define offsetof(TYPE, MEMBER) __builtin_offsetof (TYPE, MEMBER)
Signed-off-by: Alexander Alemayhu <alexander@alemayhu.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/bpf/test_lru_dist.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/samples/bpf/test_lru_dist.c b/samples/bpf/test_lru_dist.c index d96dc88d3b04..73c357142268 100644 --- a/samples/bpf/test_lru_dist.c +++ b/samples/bpf/test_lru_dist.c @@ -25,7 +25,9 @@ #include "bpf_util.h" #define min(a, b) ((a) < (b) ? (a) : (b)) -#define offsetof(TYPE, MEMBER) ((size_t)&((TYPE *)0)->MEMBER) +#ifndef offsetof +# define offsetof(TYPE, MEMBER) ((size_t)&((TYPE *)0)->MEMBER) +#endif #define container_of(ptr, type, member) ({ \ const typeof( ((type *)0)->member ) *__mptr = (ptr); \ (type *)( (char *)__mptr - offsetof(type,member) );}) |