From e2b9eb743109e07e5f3205cceea7fdc07f8ee315 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Fri, 29 Apr 2022 15:29:44 -0600 Subject: [PATCH] BSD: Use byteswap.h and endian.h defined macos when present Newer versions of FreeBSD will have a glibc compatible byteswap.h. Currently, this file assumes that FreeBSD requires bswap{16,32,64} to always be defined. This isn't the case when we're using the byteswap.h file (which is enabled by HAVE_BYTESWAP_H define). Assume that if byteswap.h and endian.h are present, then the proper macros are defined. Otherwise, assume that sys/endian.h is present and paper over the small differences between the BSDs for this file. Signed-off-by: Warner Losh --- include/bitops.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/bitops.h b/include/bitops.h index 287d4af29b..72274de0b5 100644 --- a/include/bitops.h +++ b/include/bitops.h @@ -20,6 +20,12 @@ # include #endif +#if !(defined(HAVE_BYTESWAP_H) && defined(HAVE_ENDIAN_H)) +/* + * When both byteswap.h and endian.h are preseent, the proper macros are defined + * as those files are glibc compatible. Otherwise, compensate for the slightly + * different interfaces between the different BSDs. + */ #if defined(__OpenBSD__) # include # define be16toh(x) betoh16(x) @@ -47,6 +53,7 @@ # define bswap_32(x) OSSwapInt32(x) # define bswap_64(x) OSSwapInt64(x) #endif +#endif /* * Fallbacks -- 2.47.2