From 9fc5bf734f6b25559a3227d8789efbc67156e575 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 26 Oct 2020 12:32:52 +0100 Subject: [PATCH] libnetlink: define __aligned conditionally On some systems (e.g. current Debian/stable) the inclusion of utils.h pulled in some other things that may end up defining __aligned, in a possibly different way than what we had here. Use our own definition only if there isn't one already. Fixes: d5acae244f9d ("libnetlink: add nl_print_policy() helper") Signed-off-by: Johannes Berg Signed-off-by: Stephen Hemminger --- lib/libnetlink.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libnetlink.c b/lib/libnetlink.c index a7b60d87..c958aa57 100644 --- a/lib/libnetlink.c +++ b/lib/libnetlink.c @@ -30,7 +30,9 @@ #include "libnetlink.h" #include "utils.h" +#ifndef __aligned #define __aligned(x) __attribute__((aligned(x))) +#endif #ifndef SOL_NETLINK #define SOL_NETLINK 270