public inbox for
help / color / mirror / Atom feed
From: Sebastian Huber <>
Subject: [newlib-cygwin] sys/_bitset.h: Fix fall-out from commit 5e04571cf3c
Date: Fri, 24 Jun 2022 05:43:24 +0000 (GMT)	[thread overview]
Message-ID: <> (raw);h=2f6651097e7c2bf6323745ff332cc8e9df0564b2

commit 2f6651097e7c2bf6323745ff332cc8e9df0564b2
Author: Konstantin Belousov <>
Date:   Tue Dec 7 20:15:30 2021 +0100

    sys/_bitset.h: Fix fall-out from commit 5e04571cf3c
    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
    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 5e04571cf3c.
    Reported by:    arrowd
    MFC after:      1 month

 newlib/libc/sys/rtems/include/sys/_bitset.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/newlib/libc/sys/rtems/include/sys/_bitset.h b/newlib/libc/sys/rtems/include/sys/_bitset.h
index 1c167daf3..8ce632333 100644
--- a/newlib/libc/sys/rtems/include/sys/_bitset.h
+++ b/newlib/libc/sys/rtems/include/sys/_bitset.h
@@ -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			__bitset
 #endif /* !_SYS__BITSET_H_ */

             reply	other threads:[~2022-06-24  5:43 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-24  5:43 Sebastian Huber [this message]
2022-06-24  5:43 Sebastian Huber
2022-06-24  5:43 Sebastian Huber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).