From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 19 Nov 2013 00:10:22 +0000 (+0100)
Subject: macro: change assert_cc() so that it can appear outside of functions
X-Git-Tag: v209~1394
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=780dbeef9f9d2c9f416da50a07bf0aacf3cc66c7

macro: change assert_cc() so that it can appear outside of functions
---

diff --git a/src/shared/macro.h b/src/shared/macro.h
index 9e94495dd..37cdff1cb 100644
--- a/src/shared/macro.h
+++ b/src/shared/macro.h
@@ -143,19 +143,9 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) {
         } while (false)
 
 #if defined(static_assert)
-#define assert_cc(expr)                         \
-        do {                                    \
-                static_assert(expr, #expr);     \
-        } while (false)
+#define assert_cc(expr) static_assert(expr, #expr)
 #else
-#define assert_cc(expr)                         \
-        do {                                    \
-                switch (0) {                    \
-                case 0:                         \
-                case !!(expr):                  \
-                        ;                       \
-                }                               \
-        } while (false)
+#define assert_cc(expr) struct _assert_struct_ ## __LINE__ { char x[(expr) ? 0 : -1]; }
 #endif
 
 #define assert_return(expr, r)                    \