Date: Fri, 14 Jan 2022 18:10:28 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: ca0d97022a52 - stable/13 - sys/_bitset.h: Fix fall-out from commit 5e04571cf3c Message-ID: <202201141810.20EIAS1w095508@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ca0d97022a52501be5374ee39b1b0ef68926ac3b commit ca0d97022a52501be5374ee39b1b0ef68926ac3b Author: Stefan Eßer <se@FreeBSD.org> AuthorDate: 2021-12-07 19:29:26 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2022-01-14 16:17:30 +0000 sys/_bitset.h: Fix fall-out from commit 5e04571cf3c (cherry picked from commit 22c4ab6cb015dc99eb82504e5fd957662cded3c3) --- sys/sys/bitset.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/bitset.h b/sys/sys/bitset.h index 91a5e6e37db3..47c4106d4127 100644 --- a/sys/sys/bitset.h +++ b/sys/sys/bitset.h @@ -308,12 +308,12 @@ #define __BITSET_SIZE(_s) (__bitset_words((_s)) * sizeof(long)) +#if defined(_KERNEL) || defined(_WANT_FREEBSD_BITSET) /* * Dynamically allocate a bitset. */ #define __BITSET_ALLOC(_s, mt, mf) malloc(__BITSET_SIZE((_s)), mt, (mf)) -#if defined(_KERNEL) || defined(_WANT_FREEBSD_BITSET) #define BIT_AND(_s, d, s) __BIT_AND(_s, d, s) #define BIT_AND2(_s, d, s1, s2) __BIT_AND2(_s, d, s1, s2) #define BIT_ANDNOT(_s, d, s) __BIT_ANDNOT(_s, d, s) @@ -355,6 +355,6 @@ #define BITSET_FSET(n) __BITSET_FSET(n) #define BITSET_SIZE(_s) __BITSET_SIZE(_s) #define BITSET_T_INITIALIZER(x) __BITSET_T_INITIALIZER(x) -#endif +#endif /* defined(_KERNEL) || defined(_WANT_FREEBSD_BITSET) */ #endif /* !_SYS_BITSET_H_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201141810.20EIAS1w095508>