From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1921) id BAB4B384D18C; Fri, 24 Jun 2022 05:43:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BAB4B384D18C Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Sebastian Huber To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] sys/_bitset.h: Fix fall-out from commit 5e04571cf3c X-Act-Checkin: newlib-cygwin X-Git-Author: Konstantin Belousov X-Git-Refname: refs/heads/master X-Git-Oldrev: a1071cb178bedabc7095344f72876eaaef7871c2 X-Git-Newrev: 2f6651097e7c2bf6323745ff332cc8e9df0564b2 Message-Id: <20220624054324.BAB4B384D18C@sourceware.org> Date: Fri, 24 Jun 2022 05:43:24 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jun 2022 05:43:24 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D2f6651097e7= c2bf6323745ff332cc8e9df0564b2 commit 2f6651097e7c2bf6323745ff332cc8e9df0564b2 Author: Konstantin Belousov Date: Tue Dec 7 20:15:30 2021 +0100 sys/_bitset.h: Fix fall-out from commit 5e04571cf3c =20 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. =20 The definition of a global variable "bitset" had been overlooked. This name space pollution caused a compile failure in print/miktex. =20 This commit renames the bitset variable to __bitset with the same mapping back to the bitset if _KERNEL or _WANT_FREEBSD_BITSET is defined. =20 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. =20 This commit shall be MFCed together with commit 5e04571cf3c. =20 Reported by: arrowd MFC after: 1 month Diff: --- 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); =20 #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 =20 #endif /* !_SYS__BITSET_H_ */