X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fendian%2Fendian.h;h=0c99cc802db0e0acac0668d11d305fe89b4b5aed;hb=0fe2d094b262f6e8bed798930e8c4716d33d5dc7;hp=02f5a68baf02adf94a1bcfd308c8f0a577accc48;hpb=9e2c88b5b7b9b78aa16d4238ae297a0e388ffaae;p=ccan

diff --git a/ccan/endian/endian.h b/ccan/endian/endian.h
index 02f5a68b..0c99cc80 100644
--- a/ccan/endian/endian.h
+++ b/ccan/endian/endian.h
@@ -16,8 +16,8 @@
  *	};
  */
 #define BSWAP_16(val)				\
-	((((uint16_t)val & 0x00ff) << 8)	\
-	 | (((uint16_t)val & 0xff00) >> 8))
+	((((uint16_t)(val) & 0x00ff) << 8)	\
+	 | (((uint16_t)(val) & 0xff00) >> 8))
 
 /**
  * BSWAP_32 - reverse bytes in a constant uint32_t value.
@@ -31,10 +31,10 @@
  *	};
  */
 #define BSWAP_32(val)					\
-	((((uint32_t)val & 0x000000ff) << 24)		\
-	 | (((uint32_t)val & 0x0000ff00) << 8)		\
-	 | (((uint32_t)val & 0x00ff0000) >> 8)		\
-	 | (((uint32_t)val & 0xff000000) >> 24))
+	((((uint32_t)(val) & 0x000000ff) << 24)		\
+	 | (((uint32_t)(val) & 0x0000ff00) << 8)		\
+	 | (((uint32_t)(val) & 0x00ff0000) >> 8)		\
+	 | (((uint32_t)(val) & 0xff000000) >> 24))
 
 /**
  * BSWAP_64 - reverse bytes in a constant uint64_t value.
@@ -48,14 +48,14 @@
  *	};
  */
 #define BSWAP_64(val)						\
-	((((uint64_t)val & 0x00000000000000ffULL) << 56)	\
-	 | (((uint64_t)val & 0x000000000000ff00ULL) << 40)	\
-	 | (((uint64_t)val & 0x0000000000ff0000ULL) << 24)	\
-	 | (((uint64_t)val & 0x00000000ff000000ULL) << 8)	\
-	 | (((uint64_t)val & 0x000000ff00000000ULL) >> 8)	\
-	 | (((uint64_t)val & 0x0000ff0000000000ULL) >> 24)	\
-	 | (((uint64_t)val & 0x00ff000000000000ULL) >> 40)	\
-	 | (((uint64_t)val & 0xff00000000000000ULL) >> 56))
+	((((uint64_t)(val) & 0x00000000000000ffULL) << 56)	\
+	 | (((uint64_t)(val) & 0x000000000000ff00ULL) << 40)	\
+	 | (((uint64_t)(val) & 0x0000000000ff0000ULL) << 24)	\
+	 | (((uint64_t)(val) & 0x00000000ff000000ULL) << 8)	\
+	 | (((uint64_t)(val) & 0x000000ff00000000ULL) >> 8)	\
+	 | (((uint64_t)(val) & 0x0000ff0000000000ULL) >> 24)	\
+	 | (((uint64_t)(val) & 0x00ff000000000000ULL) >> 40)	\
+	 | (((uint64_t)(val) & 0xff00000000000000ULL) >> 56))
 
 #if HAVE_BYTESWAP_H
 #include <byteswap.h>
@@ -279,7 +279,6 @@ static inline uint16_t le16_to_cpu(leint16_t le_val)
  */
 static inline beint64_t cpu_to_be64(uint64_t native)
 {
-	return ((ENDIAN_CAST beint64_t)BSWAP_64(native));
 	return CPU_TO_BE64(native);
 }