From nobody Mon Mar 28 00:17:10 2022 X-Original-To: dev-commits-src-main@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 4D4251A3F2F0; Mon, 28 Mar 2022 00:17:11 +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 4KRYD70Twkz4RhW; Mon, 28 Mar 2022 00:17:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648426631; 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=jwoMqg7TH7dxYB+EnpCqlDRf1lPmzsnkOJkbJve0eBQ=; b=bSZVkUNxLQr3IBc04Dyoq19o69pPYuY1xEIC9g6i6haQdspp/Ytsswuw9+j3DXtMeMerN/ 5KXFWwly5AGTJ5lbHwJehQ/9RyJEzrc0cbPqxcZ3LBqQFgG9Cm39F8WcWxL2Wumw8eavig t5h3vUajNki8pjgN+ZebN8kYaFQ+sUDM1+XjA9VSpz7ay6fy2nT1JFdLVf/rSrku3KLa4m JoKW5CD50sAr+EDjT9iWYWPKUxgRtij4+0OQMf45qkb4i16EnTNPJWnUyzEb5zmwYrSVXK 1SvVHxZZdb36gWGt1ZrybhD245ZvIElokjE2TIr1Z6il3aSlU9TWMIFvIsgLzA== 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 DC56F1F41E; Mon, 28 Mar 2022 00:17:10 +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 22S0HAoq061119; Mon, 28 Mar 2022 00:17:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22S0HAg7061118; Mon, 28 Mar 2022 00:17:10 GMT (envelope-from git) Date: Mon, 28 Mar 2022 00:17:10 GMT Message-Id: <202203280017.22S0HAg7061118@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c1a24b9dbead - main - sys/stdatomic.h: be nicer to c++ List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1a24b9dbeade11bfeedc91996672582f6ea32f2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648426631; 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=jwoMqg7TH7dxYB+EnpCqlDRf1lPmzsnkOJkbJve0eBQ=; b=Zfuy/RO2rAr8zmvgUuL7ZyOYDShA7WNnLtgF5LY9pR0FKugNPc9ngScHu1f+J3btg0zWBk EaD4k9D0zL7qYI3o6apP3p6QAkBkuVfNpPZ9kddNYztLUto5QPPDXwaCzyP3ZZHPruZynf g2Sp0ecszwm8+Z/ygvoqpNuNxcp2nyfigAVHjO0n37NsyyarW1A7SLwUWr0gxn1/JxLUOh 5S/yRMD6GNb9aTYyGvvAlS4DOO06X0IHwqnYMTQ16d1maMbtxqITjIUPkEWhbCJflrXQPC 2RM2Woq/HzJcB2+SPEglbzQ8DJyZRGPYeBCJqG+FjpLdsRGgdUZnKitoGf10bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648426631; a=rsa-sha256; cv=none; b=y20JxJbhKzyVCLg7aNyVVXSkK17sjB0dIIWHhoIw1WF7uPpjt8BLZ0oaVevpl0xt6ZToZp C6y3bv0vUl+yTH40foIzeFFEBPjbc4+3qEEZzW9NNLcMDOetgi1twdn9B7luvJ1z7mShyx iz/IyIk7XfvUv0bOgQ21U8mOhvGQmOndw1CEITvsFT1egoTdSNHMVOSq9xbVOzAFY3b9RS h1lWG0dOL24s0Us+wWz781a741iWpWvzRNSQfgfPa0EFqdTFgnBz1bBBuPNMGBw57y0e8Z 7RmuIZFWfMbvaVBcD6zdq0aELWfh7JhNtEndcJBVzE+LKEAc7rAVy+lxLwhkBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c1a24b9dbeade11bfeedc91996672582f6ea32f2 commit c1a24b9dbeade11bfeedc91996672582f6ea32f2 Author: Konstantin Belousov AuthorDate: 2022-03-27 21:16:15 +0000 Commit: Konstantin Belousov CommitDate: 2022-03-28 00:16:02 +0000 sys/stdatomic.h: be nicer to c++ Use of stdatomic.h is undefined in C++, even the C++ 2020 standard does not list stdatomic.h as a C library header supported by the language. More, there are some subtle differences between the C++ header, and C11+ stdatomic.h provided features. Nonetheless, it is a quality of the implementation aspect, so let mis-users mis-use stdatomic.h as they want, by making a compat shim for _Bool. PR: 262683 Reported by: yuri Reviewed by: dim, emaste Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D34686 --- sys/sys/stdatomic.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/sys/stdatomic.h b/sys/sys/stdatomic.h index 4dc6d680f934..f4fd1c6ae60e 100644 --- a/sys/sys/stdatomic.h +++ b/sys/sys/stdatomic.h @@ -163,6 +163,11 @@ atomic_signal_fence(memory_order __order __unused) #endif } +#if defined(__cplusplus) && !defined(_Bool) +#define _Bool bool +#define __bool_locally_defined +#endif + /* * 7.17.5 Lock-free property. */ @@ -406,4 +411,9 @@ atomic_flag_clear(volatile atomic_flag *__object) } #endif /* !_KERNEL */ +#ifdef __bool_locally_defined +#undef _Bool +#undef __bool_locally_defined +#endif + #endif /* !_STDATOMIC_H_ */