From a2453456f2942e04d2b2caaf324aa0b7c2ed74eb Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 24 Oct 2013 11:33:22 +0200
Subject: [PATCH] utils.h: fix name collisions in __u_bswap16 with using "val"
 both inside the macro and as argument

Reported-by: Markus Stenberg <markus.stenberg@iki.fi>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
 utils.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utils.h b/utils.h
index db6217e..8d4e810 100644
--- a/utils.h
+++ b/utils.h
@@ -100,7 +100,10 @@ void clock_gettime(int type, struct timespec *tv);
 #define __LITTLE_ENDIAN LITTLE_ENDIAN
 #endif
 
-#define __u_bswap16(x) ({ uint16_t val = (x); ((uint16_t)(((val >> 8) & 0xffu) | ((val & 0xffu) << 8))); })
+static inline uint16_t __u_bswap16(uint16_t val)
+{
+	return ((val >> 8) & 0xffu) | ((val & 0xffu) << 8);
+}
 
 #if _GNUC_MIN_VER(4, 2)
 #define __u_bswap32(x) __builtin_bswap32(x)