Skip to content

Commit

Permalink
devel/util-linux: Future-proofing patch
Browse files Browse the repository at this point in the history
  • Loading branch information
bsdimp authored and yurivict committed Apr 29, 2022
1 parent 3c253f5 commit 3a450f6
Showing 1 changed file with 40 additions and 0 deletions.
40 changes: 40 additions & 0 deletions devel/util-linux/files/patch-include_bitops.h
@@ -0,0 +1,40 @@
commit a38d1f69fee5ca7e883b09ed3668a7da3b161051
Author: Warner Losh <imp@FreeBSD.org>
Date: Fri Apr 29 15:29:44 2022 -0600

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 <imp@bsdimp.com>

--- include/bitops.h
+++ include/bitops.h
@@ -20,6 +20,12 @@
# include <sys/endian.h>
#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 <sys/types.h>
# define be16toh(x) betoh16(x)
@@ -47,6 +53,7 @@
# define bswap_32(x) OSSwapInt32(x)
# define bswap_64(x) OSSwapInt64(x)
#endif
+#endif

/*
* Fallbacks

0 comments on commit 3a450f6

Please sign in to comment.