From 4888ee7e838007f14d27474dbcb0276f5f315afa Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 29 Jun 2018 09:52:01 +0200 Subject: [PATCH] platform: change temp variable name in NLA_PUT_TYPE() __tmp clashes with htole16() on s390x. Fixes: 4120ad243198095ad4629982c849802c3a8b5f5c https://github.com/NetworkManager/NetworkManager/pull/151 --- src/platform/nm-netlink.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/nm-netlink.h b/src/platform/nm-netlink.h index 8ae2641d6a..24565d074d 100644 --- a/src/platform/nm-netlink.h +++ b/src/platform/nm-netlink.h @@ -237,8 +237,8 @@ nla_put_string (struct nl_msg *msg, int attrtype, const char *str) #define NLA_PUT_TYPE(msg, type, attrtype, value) \ do { \ - type __tmp = value; \ - NLA_PUT(msg, attrtype, sizeof(type), &__tmp); \ + type __nla_tmp = value; \ + NLA_PUT(msg, attrtype, sizeof(type), &__nla_tmp); \ } while(0) #define NLA_PUT_U8(msg, attrtype, value) \