utils.h: fix name collisions in __u_bswap16 with using "val" both inside the macro...

Reported-by: Markus Stenberg <markus.stenberg@iki.fi>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

diff --git a/utils.h b/utils.h
index db6217ed849b53de35e5b8419e7ba89afc579795..8d4e8100498a549b4bf1fa2dd7882d78d13dbbde 100644 (file)
--- 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)