summaryrefslogtreecommitdiff
path: root/src/basic
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2015-09-14 20:32:17 +0200
committerSven Eden <yamakuzure@gmx.net>2017-03-29 10:45:09 +0200
commit9f8b2124694ac1637198d9a336e2c97e79fd8c23 (patch)
tree8975c93a71ca4836337301f0e56dc621b76aeea9 /src/basic
parentdaba0b92bcc7f7541aa7984c4b5ea48748bb46c3 (diff)
basic: make sure argument of ELEMENTSOF is an array
Using ELEMENTSOF on a pointer will result in a compilation error.
Diffstat (limited to 'src/basic')
-rw-r--r--src/basic/macro.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/basic/macro.h b/src/basic/macro.h
index b9a24f639..e93d7f155 100644
--- a/src/basic/macro.h
+++ b/src/basic/macro.h
@@ -124,8 +124,11 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) {
return 1UL << (sizeof(u) * 8 - __builtin_clzl(u - 1UL));
}
-#define ELEMENTSOF(x) (sizeof(x)/sizeof((x)[0]))
-
+#define ELEMENTSOF(x) \
+ __extension__ (__builtin_choose_expr( \
+ !__builtin_types_compatible_p(typeof(x), typeof(&*(x))), \
+ sizeof(x)/sizeof((x)[0]), \
+ (void)0))
/*
* container_of - cast a member of a structure out to the containing structure
* @ptr: the pointer to the member.