X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=29c5c2b89c4ac3e0ca820c26c07cd8be4755f266;hp=c5e12fe6da3ef864bdc16bb0eaa178a8b5965cee;hb=69a7e7aa11d8bf9b05d6431c57276befbc9b35a3;hpb=b62e2796b85c7d7f3138fe729f4637853e0fafe0

diff --git a/para.h b/para.h
index c5e12fe6..29c5c2b8 100644
--- a/para.h
+++ b/para.h
@@ -165,13 +165,38 @@ _static_inline_ long int para_random(unsigned max)
 	return ((max + 0.0) * (random() / (RAND_MAX + 1.0)));
 }
 
+/** Round up x to next multiple of y. */
+#define ROUND_UP(x, y) ({ \
+	const typeof(y) _divisor = y; \
+	((x) + _divisor - 1) / _divisor * _divisor; })
+
+/** Round down x to multiple of y. */
+#define ROUND_DOWN(x, y) ({ \
+	const typeof(y) _divisor = y; \
+	(x) / _divisor * _divisor; })
+
 /** Divide and round up to next integer. */
 #define DIV_ROUND_UP(x, y) ({ \
 	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.