diff options
| author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-12-18 11:08:28 +0000 |
|---|---|---|
| committer | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-12-19 15:08:30 +0000 |
| commit | 99ddff0c7f836e05156a0a084b2895ef2607811d (patch) | |
| tree | 27bb1c225de63ac08545fa1aced20c3dc4ae142c /tools | |
| parent | 8b2efc87dbf2a194c7d8afccf36a3f9f73854170 (diff) | |
| download | upstream-99ddff0c7f836e05156a0a084b2895ef2607811d.tar.gz upstream-99ddff0c7f836e05156a0a084b2895ef2607811d.tar.bz2 upstream-99ddff0c7f836e05156a0a084b2895ef2607811d.zip | |
tools: Update endian definitions for Mac OSX
- it appears (at least from OS X verison 10.10, Yosemite) that the
big and little endian defintions have changed.
the older
#include <sys/_endian.h>
#include <architecture/byte_order.h>
reference yielded the following warning:
#define __bswap_16(x) NXSwapShort(x)
^
/usr/include/architecture/byte_order.h:45:1: note: 'NXSwapShort' has been explicitly marked deprecated here
For the new OS X editions, it seems that we need to refer to:
#include <netinet/in.h>
#include <libkern/OSByteOrder.h>
and respectively use 'OSSwapInt16', 'OSSwapInt32', & 'OSSwapInt64', in
place of 'NXSwapShort', 'NXSwapLong' & 'NXSwapLongLong'.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/include/endian.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/include/endian.h b/tools/include/endian.h index bba70abd83..e2ac755667 100644 --- a/tools/include/endian.h +++ b/tools/include/endian.h @@ -5,11 +5,11 @@ #include <byteswap.h> #include_next <endian.h> #elif defined(__APPLE__) -#include <machine/endian.h> -#include <machine/byte_order.h> -#define bswap_16(x) NXSwapShort(x) -#define bswap_32(x) NXSwapInt(x) -#define bswap_64(x) NXSwapLongLong(x) +#include <netinet/in.h> +#include <libkern/OSByteOrder.h> +#define bswap_16(x) OSSwapInt16(x) +#define bswap_32(x) OSSwapInt32(x) +#define bswap_64(x) OSSwapInt64(x) #elif defined(__FreeBSD__) #include <sys/endian.h> #define bswap_16(x) bswap16(x) |