]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
json: use new _align_() macro
authorLennart Poettering <lennart@poettering.net>
Mon, 3 Dec 2018 12:17:28 +0000 (13:17 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 3 Dec 2018 12:28:26 +0000 (13:28 +0100)
src/shared/json.h

index 278ff77d30356e7a222df23f7cbb2049a70d39d6..4a21a411acd658e3ae0e83c76df15c9865c8f213 100644 (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); \
         })