Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.openwrt.org/project/libubox.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-10-24 13:33:22 +0400
committerFelix Fietkau <nbd@openwrt.org>2013-10-24 13:33:23 +0400
commita2453456f2942e04d2b2caaf324aa0b7c2ed74eb (patch)
tree0e1075a8469e7677e6eb66e19c7a3c9be3bba81e /utils.h
parent13a9b7c709ed78ec10a3fec2b631c2c3cfa2792f (diff)
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>
Diffstat (limited to 'utils.h')
-rw-r--r--utils.h5
1 files changed, 4 insertions, 1 deletions
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)