SEC: Add LM3S backend for entropy pulling.

[bertos.git] / bertos / cfg / compiler.h

diff --git a/bertos/cfg/compiler.h b/bertos/cfg/compiler.h
index e8a76ab1af9e3fddb5af5bf8a753ab00fb670315..843af838c502621f473713c8dff6a945357b28e6 100644 (file)
--- a/bertos/cfg/compiler.h
+++ b/bertos/cfg/compiler.h
@@ -540,10 +540,10 @@ typedef unsigned char sigmask_t; /**< Type for signal masks. */
                 * NOTE: the construct __builtin_types_compatible_p() is only
                 * available for C.
                 */
-               #define countof(a) (sizeof(a) / sizeof(*(a)) + \
-                       sizeof(typeof(int[1 - 2 * \
-                               !!__builtin_types_compatible_p(typeof(a), \
-                                               typeof(&a[0]))])) * 0)
+               #define countof(a) (sizeof(a) / sizeof(*(a)) +          \
+                               STATIC_ASSERT_EXPR(                     \
+                                       !__builtin_types_compatible_p(  \
+                                               typeof(a), typeof(&a[0]))))
        #else
                #define countof(a)  (sizeof(a) / sizeof(*(a)))
        #endif
@@ -580,6 +580,13 @@ typedef unsigned char sigmask_t; /**< Type for signal masks. */
 #define STATIC_ASSERT(condition)  \
        UNUSED_VAR(extern char, STATIC_ASSERTION_FAILED__[(condition) ? 1 : -1])
 
+/**
+ * Issue a compilation error if \a __cond is false (this can be used inside an
+ * expression).
+ */
+#define STATIC_ASSERT_EXPR(__cond) \
+       (sizeof(struct { int STATIC_ASSERTION_FAILED__:!!(__cond); }) * 0)
+
 #ifndef ASSERT_TYPE_EQUAL
        /** Ensure two variables have the same type. */
        #define ASSERT_TYPE_EQUAL(var1, var2)  \