diff options
| author | Scott Mansell <phiren@gmail.com> | 2016-07-18 15:51:05 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-18 15:51:05 +1200 |
| commit | 7139b6bae6301f667a9ebff2ec7f7dc1820bbf2c (patch) | |
| tree | afe5183a3ca07cb18c2699d908824b91331a15bf /Source | |
| parent | 4b9173ca62a9a6cf7da72da69958b1be0d495450 (diff) | |
| parent | 9a14cbb225b3859e208bfa9a0988ffc7f2e7f633 (diff) | |
Merge pull request #4024 from bentley/swap
Undefine OpenBSD's system byteswap macros to pick up generic functions.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Common/CommonFuncs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h index 15b3debe28..8dd7d0f6d1 100644 --- a/Source/Core/Common/CommonFuncs.h +++ b/Source/Core/Common/CommonFuncs.h @@ -114,7 +114,7 @@ inline u32 swap24(const u8* _data) return (_data[0] << 16) | (_data[1] << 8) | _data[2]; } -#ifdef ANDROID +#if defined(ANDROID) || defined(__OpenBSD__) #undef swap16 #undef swap32 #undef swap64 |