d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sys/_bitset.h: Fix fall-out from commit 5e04571cf3

Browse Source 
The changes to the bitset macros allowed sched.h to be included into
userland programs without name space pollution due to BIT_* and
BITSET_* macros.

The definition of a global variable "bitset" had been overlooked.
This name space pollution caused a compile failure in print/miktex.

This commit renames the bitset variable to __bitset with the same
mapping back to the bitset if _KERNEL or _WANT_FREEBSD_BITSET is
defined.

This fix has been suggested by kib. It has been tested to let the
build of the print/miktex port succeed and to not break buildworld.

This commit shall be MFCed together with commit 5e04571cf3.

Reported by:	arrowd
MFC after:	1 month
This commit is contained in:
Konstantin Belousov 2021-12-07 20:15:30 +01:00 committed by Stefan Eßer
parent 73db11a4d1
commit 74e014dbfa
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/sys/_bitset.h
View File

@ -61,11 +61,13 @@ struct _t { \
* Define a default type that can be used while manually specifying size
* to every call.
*/
__BITSET_DEFINE(bitset, 1);
__BITSET_DEFINE(__bitset, 1);
#if defined(_KERNEL) || defined(_WANT_FREEBSD_BITSET)
#define BITSET_DEFINE(_t, _s) __BITSET_DEFINE(_t, _s)
#define BITSET_DEFINE_VAR(_t) __BITSET_DEFINE_VAR(_t)
#define bitset __bitset
#endif
#endif /* !_SYS__BITSET_H_ */