diff options
author | Martin Ebourne <martin@ebourne.me.uk> | 2005-12-28 07:35:17 +0000 |
---|---|---|
committer | Martin Ebourne <martin@ebourne.me.uk> | 2005-12-28 07:35:17 +0000 |
commit | 64b59e90e6adf33a99cd902964548ea82bab754d (patch) | |
tree | ad97f8c46ff49aade05754062ce7a138e2dea5ce /lib/common/Box.h | |
parent | 2ad91211830d46536be022bd57c2aa942035f4de (diff) |
Don't use betoh64/be64tonh to avoid name hassle
Diffstat (limited to 'lib/common/Box.h')
-rw-r--r-- | lib/common/Box.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/common/Box.h b/lib/common/Box.h index 8ea08074..c988e296 100644 --- a/lib/common/Box.h +++ b/lib/common/Box.h @@ -137,12 +137,10 @@ inline uint64_t box_swap64(uint64_t x) #else #ifdef HAVE_SYS_ENDIAN_H #include <sys/endian.h> + // betoh64 (OpenBSD) is sometimes called be64toh (FreeBSD, NetBSD). + // Rather than check for it just reuse htobe64 since they are symmetrical #define box_hton64(x) htobe64(x) - #ifdef HAVE_BE64TOH - #define box_ntoh64(x) be64toh(x) - #else - #define box_ntoh64(x) betoh64(x) - #endif + #define box_ntoh64(x) htobe64(x) #elif HAVE_ASM_BYTEORDER_H #include <asm/byteorder.h> #define box_hton64(x) __cpu_to_be64(x) |