From 780dbeef9f9d2c9f416da50a07bf0aacf3cc66c7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 19 Nov 2013 01:10:22 +0100 Subject: macro: change assert_cc() so that it can appear outside of functions --- src/shared/macro.h | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/shared') diff --git a/src/shared/macro.h b/src/shared/macro.h index 9e94495dd6..37cdff1cb3 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) \ -- cgit v1.2.3-54-g00ecf