diff options
| author | Daniel Lim Wee Soong <weesoong.lim@gmail.com> | 2018-03-27 17:54:29 +0800 |
|---|---|---|
| committer | Daniel Lim Wee Soong <weesoong.lim@gmail.com> | 2018-04-03 02:25:11 +0800 |
| commit | a66204eb5c6eb5d54cfb29adbf289ca446dfd2ef (patch) | |
| tree | 92921af6bc799186b8290a203d5ddfeb473b9ee9 /src/common/swap.h | |
| parent | 6022bc839442784394be18f1bf5aa75c05634c63 (diff) | |
common: fix swap functions on Bitrig and OpenBSD
swap{16,32,64} are defined as macros on the two, but client code
tries to invoke them as Common::swap{16,32,64}, which naturally
doesn't work. This hack redefines the macros as inline functions
in the Common namespace: the bodies of the functions are the
same as the original macros, but relying on OS-specific
implementation details like this is of course brittle.
Diffstat (limited to 'src/common/swap.h')
| -rw-r--r-- | src/common/swap.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/common/swap.h b/src/common/swap.h index d94cbe6b25..4a4012d1ad 100644 --- a/src/common/swap.h +++ b/src/common/swap.h @@ -103,7 +103,19 @@ inline __attribute__((always_inline)) u64 swap64(u64 _data) { return __builtin_bswap64(_data); } #elif defined(__Bitrig__) || defined(__OpenBSD__) -// swap16, swap32, swap64 are left as is +// redefine swap16, swap32, swap64 as inline functions +#undef swap16 +#undef swap32 +#undef swap64 +inline u16 swap16(u16 _data) { + return __swap16(_data); +} +inline u32 swap32(u32 _data) { + return __swap32(_data); +} +inline u64 swap64(u64 _data) { + return __swap64(_data); +} #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) inline u16 swap16(u16 _data) { return bswap16(_data); |