| Message ID | 20201026113252.18018-1-johannes@sipsolutions.net (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Stephen Hemminger |
| Headers | show |
| Series | libnetlink: define __aligned conditionally | expand |
diff --git a/lib/libnetlink.c b/lib/libnetlink.c index a7b60d873afb..c958aa57d0cd 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
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 <johannes@sipsolutions.net> --- lib/libnetlink.c | 2 ++ 1 file changed, 2 insertions(+)