diff options
| author | dim <dim@FreeBSD.org> | 2012-03-09 20:34:31 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2012-03-09 20:34:31 +0000 |
| commit | cf2c2fde9c2e8aee31d99fbd468a7eeaf987cb1a (patch) | |
| tree | 3cce8341db1182b40e9d74239f83152f65e58007 /sys/powerpc/include | |
| parent | d6f48ea8cc824233cf311f52698aa98f62065584 (diff) | |
| download | FreeBSD-src-cf2c2fde9c2e8aee31d99fbd468a7eeaf987cb1a.zip FreeBSD-src-cf2c2fde9c2e8aee31d99fbd468a7eeaf987cb1a.tar.gz | |
Add casts to __uint16_t to the __bswap16() macros on all arches which
didn't already have them. This is because the ternary expression will
return int, due to the Usual Arithmetic Conversions. Such casts are not
needed for the 32 and 64 bit variants.
While here, add additional parentheses around the x86 variant, to
protect against unintended consequences.
MFC after: 2 weeks
Diffstat (limited to 'sys/powerpc/include')
| -rw-r--r-- | sys/powerpc/include/endian.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/powerpc/include/endian.h b/sys/powerpc/include/endian.h index 15dd7db..bfca169 100644 --- a/sys/powerpc/include/endian.h +++ b/sys/powerpc/include/endian.h @@ -124,8 +124,8 @@ __bswap64_var(__uint64_t _x) ((_x << 40) & ((__uint64_t)0xff << 48)) | ((_x << 56))); } -#define __bswap16(x) (__is_constant(x) ? __bswap16_const(x) : \ - __bswap16_var(x)) +#define __bswap16(x) ((__uint16_t)(__is_constant(x) ? __bswap16_const(x) : \ + __bswap16_var(x))) #define __bswap32(x) (__is_constant(x) ? __bswap32_const(x) : \ __bswap32_var(x)) #define __bswap64(x) (__is_constant(x) ? __bswap64_const(x) : \ |
