Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Jan 2022 18:10:29 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: fddbba918dc7 - stable/13 - sys/_bitset.h: Fix fall-out from commit 5e04571cf3c
Message-ID:  <202201141810.20EIATQ2095532@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=fddbba918dc74f860348775c6c68107c59b12a11

commit fddbba918dc74f860348775c6c68107c59b12a11
Author:     Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2021-12-08 07:47:42 +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 49c2c62889b06d781c5e1f96bce0e26fd21ceb04)
---
 sys/sys/_bitset.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sys/sys/_bitset.h b/sys/sys/_bitset.h
index 1c167daf3f09..70b9713ffada 100644
--- a/sys/sys/_bitset.h
+++ b/sys/sys/_bitset.h
@@ -52,7 +52,7 @@ struct _t {								\
 /*
  * Helper to declare a bitset without it's size being a constant.
  *
- * Sadly we cannot declare a bitset struct with '__bits[]', because it's
+ * Sadly we cannot declare a bitset struct with 'bits[]', because it's
  * the only member of the struct and the compiler complains.
  */
 #define __BITSET_DEFINE_VAR(_t)	__BITSET_DEFINE(_t, 1)
@@ -61,11 +61,12 @@ struct _t {								\
  * Define a default type that can be used while manually specifying size
  * to every call.
  */
-__BITSET_DEFINE(bitset, 1);
 
 #if defined(_KERNEL) || defined(_WANT_FREEBSD_BITSET)
+__BITSET_DEFINE(bitset, 1);
+
 #define	BITSET_DEFINE(_t, _s)	__BITSET_DEFINE(_t, _s)
 #define	BITSET_DEFINE_VAR(_t)	__BITSET_DEFINE_VAR(_t)
-#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.20EIATQ2095532>