Merge pull request #11031 from poettering/gcc-attr-cleanup

various gcc attribute clean-ups
This commit is contained in:
Lennart Poettering
2018-12-03 21:59:00 +01:00
committed by GitHub
18 changed files with 120 additions and 52 deletions
+2 -2
View File
@@ -274,9 +274,9 @@ int json_log_internal(JsonVariant *variant, int level, int error, const char *fi
#define JSON_VARIANT_STRING_CONST(x) _JSON_VARIANT_STRING_CONST(UNIQ, (x))
#define _JSON_VARIANT_STRING_CONST(xq, x) \
#define _JSON_VARIANT_STRING_CONST(xq, x) \
({ \
__attribute__((__aligned__(2))) static const char UNIQ_T(json_string_const, xq)[] = (x); \
_align_(2) static const char UNIQ_T(json_string_const, xq)[] = (x); \
assert((((uintptr_t) UNIQ_T(json_string_const, xq)) & 1) == 0); \
(JsonVariant*) ((uintptr_t) UNIQ_T(json_string_const, xq) + 1); \
})