From: David Herrmann <dh.herrmann@gmail.com>
Date: Fri, 22 Nov 2013 08:19:00 +0000 (+0100)
Subject: macro: fix assert_cc() fallback
X-Git-Tag: v209~1337
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=b5be11e82364d65bec3647e6a26dca482bd6a491;p=elogind.git

macro: fix assert_cc() fallback

We need two-level macro-expansion, otherwise __LINE__ will not get
evaluated.
---

diff --git a/src/shared/macro.h b/src/shared/macro.h
index c22de9170..aadb1959c 100644
--- a/src/shared/macro.h
+++ b/src/shared/macro.h
@@ -145,7 +145,9 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) {
 #if defined(static_assert)
 #define assert_cc(expr) static_assert(expr, #expr)
 #else
-#define assert_cc(expr) struct _assert_struct_ ## __LINE__ { char x[(expr) ? 0 : -1]; }
+#define assert___cc(expr, line) struct _assert_struct_ ## line { char x[(expr) ? 0 : -1]; }
+#define assert__cc(expr, line) assert___cc((expr), line)
+#define assert_cc(expr) assert__cc((expr), __LINE__)
 #endif
 
 #define assert_return(expr, r)                    \