diff options
| author | fanquake <fanquake@gmail.com> | 2019-10-19 13:45:36 -0400 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2019-10-24 16:01:44 -0400 |
| commit | 8c6081a884cd0969160955ce8687d4d4ed074db3 (patch) | |
| tree | 6ce4d70261c22574a3bf51c64af96f9e1615a1ca /src | |
| parent | 2cba35ab38b492768e85bd77442a566dda169466 (diff) | |
compat: remove bswap_* check on macOS
This was originally added in #9366 to fix the gui build, as
Protobuf would also define these macros. Now that we're no-longer
using Protobuf, remove the additional check.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compat/byteswap.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/compat/byteswap.h b/src/compat/byteswap.h index fe47f4899f..c254fe7cbf 100644 --- a/src/compat/byteswap.h +++ b/src/compat/byteswap.h @@ -17,20 +17,13 @@ #if defined(MAC_OSX) -#if !defined(bswap_16) - -// Mac OS X / Darwin features; we include a check for bswap_16 because if it is already defined, protobuf has -// defined these macros for us already; if it isn't, we do it ourselves. In either case, we get the exact same -// result regardless which path was taken #include <libkern/OSByteOrder.h> #define bswap_16(x) OSSwapInt16(x) #define bswap_32(x) OSSwapInt32(x) #define bswap_64(x) OSSwapInt64(x) -#endif // !defined(bswap_16) - #else -// Non-Mac OS X / non-Darwin +// Non-MacOS / non-Darwin #if HAVE_DECL_BSWAP_16 == 0 inline uint16_t bswap_16(uint16_t x) |