From nobody Tue Dec 7 19:28:57 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5702D18CE0F9; Tue, 7 Dec 2021 19:28:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J7r2L0X2Zz4lyY; Tue, 7 Dec 2021 19:28:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E75D625361; Tue, 7 Dec 2021 19:28:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B7JSvsC041859; Tue, 7 Dec 2021 19:28:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B7JSvRI041858; Tue, 7 Dec 2021 19:28:57 GMT (envelope-from git) Date: Tue, 7 Dec 2021 19:28:57 GMT Message-Id: <202112071928.1B7JSvRI041858@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: 74e014dbfab5 - main - sys/_bitset.h: Fix fall-out from commit 5e04571cf3c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74e014dbfab5d64acb3376ba77d5d61c4abf27d5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638905338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=18zwFHBaMuckCD1pyIbk9G2G704oOvgHhyH3oCvp+1k=; b=QM64Vt0CyEe9Z9DnaL//HdvS6H3c/UPxP7ucHH+wa7+ZcDxhrIJjO/C004UujjUALUWrdT b2S0qmIzcCY4NhjfB/hAQZcvfbCj9Obnn6DxwWOLU3FLk3x6jZqdF+HivsBkulE/FC6YE/ utWtB+ni1AoEtiMRIQmWZRcvyl2scH8xw3PgR78abwRKBZwee2w2BfRpLyMNBzImV7WcMy m7HmENq3YBJqXsXUwVsIsy36chLPVFlNuEly0R84Zp/Glbow2K9DvvcQGC6Peom8oMEXyA MXCfPn0PvS4+CWYloteBhaozOPC1+Mco4zZoNRUTwELrIMas64s8Gjj/b+77MQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638905338; a=rsa-sha256; cv=none; b=HK+bM7D4rYLpR5Dmzo9SGd0yzNLK3IGVxq7+f3wZyGq/bVLrkLRccoFGo8+SGqX6LgyjOY hPgV+FgNvz+jJVcmuYWmONgL/Rc7lR9gilm1pfOW9UUEC5R0OQTUZPrShLBsTddOwSiSm3 DEkZ7kLo+H3bNS7JldkQCc9J95Tw4/GINaEsN6At85CGQsPXVgm9ANmbTMSq0tHlKAsaka ZQ6f94wXwuRYaUmzZKnYnLmFkJ7UPvecXYYmq7LfxbptbGF2FRSRP/Rn0GDjzSOvomgCmS jAa+qSOgtdEJdTIH/VlNYN2K8pBj8zh/xpMjW7XBCvM/IbDAlz7qpRZz+eLzJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=74e014dbfab5d64acb3376ba77d5d61c4abf27d5 commit 74e014dbfab5d64acb3376ba77d5d61c4abf27d5 Author: Konstantin Belousov AuthorDate: 2021-12-07 19:15:30 +0000 Commit: Stefan Eßer CommitDate: 2021-12-07 19:28:22 +0000 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 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 5e04571cf3c. Reported by: arrowd MFC after: 1 month --- sys/sys/_bitset.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/sys/_bitset.h b/sys/sys/_bitset.h index 1c167daf3f09..8ce63233389a 100644 --- a/sys/sys/_bitset.h +++ b/sys/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_DEFINE_VAR(_t) __BITSET_DEFINE_VAR(_t) + +#define bitset __bitset #endif #endif /* !_SYS__BITSET_H_ */