diff options
author | Riccardo Spagni <ric@spagni.net> | 2016-01-25 19:37:45 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2016-01-25 19:37:45 +0200 |
commit | d7b4e77aa3c49cafc34c4f26ec36e9aa553673c1 (patch) | |
tree | df81081e4902d84a5faeb5956b0f7a8be3731de4 /src/common | |
parent | Merge pull request #616 (diff) | |
parent | My markdown-fu sucks :P (diff) | |
download | monero-d7b4e77aa3c49cafc34c4f26ec36e9aa553673c1.tar.xz |
Merge pull request #618
64f4cd9 My markdown-fu sucks :P (me0wmix)
a6794e2 Instructions updated to include g++ package and omit optional packages (me0wmix)
34ebfe3 Last fixups in the Cmake stuff and better default build instruction (me0wmix)
82ecb3f More formatting fixes to instructions (me0wmix)
efc771d Corrected formatting on OpenBSD instructions (me0wmix)
c965bf4 Added/corrected OpenBSD build instructions. (me0wmix)
28f95eb OpenBSD support for Monero. (me0wmix)
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/int-util.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/int-util.h b/src/common/int-util.h index 45ee5ef70..e9eddee9c 100644 --- a/src/common/int-util.h +++ b/src/common/int-util.h @@ -137,6 +137,7 @@ static inline uint32_t div128_32(uint64_t dividend_hi, uint64_t dividend_lo, uin static inline uint32_t ident32(uint32_t x) { return x; } static inline uint64_t ident64(uint64_t x) { return x; } +#ifndef __OpenBSD__ static inline uint32_t swap32(uint32_t x) { x = ((x & 0x00ff00ff) << 8) | ((x & 0xff00ff00) >> 8); return (x << 16) | (x >> 16); @@ -146,6 +147,7 @@ static inline uint64_t swap64(uint64_t x) { x = ((x & 0x0000ffff0000ffff) << 16) | ((x & 0xffff0000ffff0000) >> 16); return (x << 32) | (x >> 32); } +#endif #if defined(__GNUC__) #define UNUSED __attribute__((unused)) |