Merge branch 't/array_size'

diff --git a/gcc-compat.h b/gcc-compat.h
index ffd714f7c7c36a085e24d20e2ecd0a680af0406a..45d9c9ba8dcf1497001014a6fa06841c427d08be 100644 (file)
--- a/gcc-compat.h
+++ b/gcc-compat.h
@@ -23,3 +23,4 @@
 # endif
 
 #define _static_inline_ static inline
+

diff --git a/para.h b/para.h
index f095a6aa385d2f717048f1e25e15741a15632617..29c5c2b89c4ac3e0ca820c26c07cd8be4755f266 100644 (file)
--- a/para.h
+++ b/para.h
@@ -180,8 +180,23 @@ _static_inline_ long int para_random(unsigned max)
        typeof(y) _divisor = y; \
        ((x) + _divisor - 1) / _divisor; })
 
+/**
+ * Assert a build-time dependency, as an expression.
+ *
+ * \param cond The compile-time condition which must be true.
+ *
+ * Compilation will fail if the condition isn't true, or can't be evaluated by
+ * the compiler. This can be used in an expression: its value is "0".
+ *
+ * Taken from ccan.
+ */
+#define EXPR_BUILD_ASSERT(cond) (sizeof(char [1 - 2 * !(cond)]) - 1)
+
+/* &a[0] degrades to a pointer: a different type from an array */
+#define _array_size_chk(arr) EXPR_BUILD_ASSERT(\
+       !__builtin_types_compatible_p(typeof(arr), typeof(&(arr)[0])))
 /** Get the size of an array */
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + _array_size_chk(arr))
 
 /**
  * Wrapper for isspace.