From 55c276e8fe49cbaf2f5b8ccec5af3e4017e784fe Mon Sep 17 00:00:00 2001 From: Stéphane Raimbault Date: Wed, 22 May 2013 23:09:55 +0200 Subject: [PATCH] Avoid overriding of bswap_32 because bswap_16 is undefined --- src/modbus-data.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/modbus-data.c b/src/modbus-data.c index fab4919..c0505b3 100644 --- a/src/modbus-data.c +++ b/src/modbus-data.c @@ -40,13 +40,17 @@ # endif #endif -#if !defined (bswap_16) || !defined (bswap_32) -# warning "Fallback on C functions for bswap_32" +#if !defined(bswap_32) + +#if !defined(bswap_16) +# warning "Fallback on C functions for bswap_16" static inline uint16_t bswap_16(uint16_t x) { return (x >> 8) | (x << 8); } +#endif +# warning "Fallback on C functions for bswap_32" static inline uint32_t bswap_32(uint32_t x) { return (bswap_16(x & 0xffff) << 16) | (bswap_16(x >> 16)); -- libgit2 0.21.4