basic: make sure argument of ELEMENTSOF is an array

[elogind.git] / src / basic / macro.h

diff --git a/src/basic/macro.h b/src/basic/macro.h
index b9a24f639ac45b71982fe3a0aac90c2be8e9b36d..e93d7f155273a8a8618eaed8df429a03b88bbcfe 100644 (file)
--- 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.