shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-24 21:34:08 +03:00
Code

macro: fix problem with __LINE__ macro expansion

Browse Source 
David:
I already applied a fix for that, but this patch definitely looks nicer. I
changed CONCATENATE_HELPER() -> XCONCATENATE() similar to XSTRINGIFY and
added the UNIQUE() helper.
This commit is contained in:
Lukasz Skalski 2013-11-22 14:44:45 +01:00 committed by David Herrmann
parent 128c3c5881
commit ab9cbe342e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/shared/macro.h
View File

@ -53,6 +53,11 @@
#define XSTRINGIFY(x) #x
#define STRINGIFY(x) XSTRINGIFY(x)
#define XCONCATENATE(x, y) x ## y
#define CONCATENATE(x, y) XCONCATENATE(x, y)
#define UNIQUE(prefix) CONCATENATE(prefix, __LINE__)
/* Rounds up */
#define ALIGN4(l) (((l) + 3) & ~3)
@ -145,9 +150,7 @@ 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, 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__)
#define assert_cc(expr) struct UNIQUE(_assert_struct_) { char x[(expr) ? 0 : -1]; };
#endif
#define assert_return(expr, r) \