From nobody Sun May 10 18:14:41 2026 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 4gD9xF2ctTz6cjtd for ; Sun, 10 May 2026 18:14:41 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD9xF1vkZz3Ls2 for ; Sun, 10 May 2026 18:14:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436881; 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=fGQsMtDBvLDyBCL1MUxjlqtuwJwvYmiPsHpNQoITAuU=; b=I423YP9S/O2UAcHq/LnH4Qza3dfWfWuKuacByRD31tK2SdrFYqhIOEgBPlYizyjPDtFMKf z4evhObJXH2SXEiucvOyjlSrL/l3L3yyXiXoyhJpTSN+THYFQEUUEkNeJIUmGLUgRm/X+P tA5tFMHToM/trwTA4QbfCc8ahfh7yzDpfXLIOg40XYF59v1Frw1CXas7ZTJHBeQ6kzhSEA 61k8pAbYubrZYTOLH1y177f14gNSJaicu5YKBZ5pi4sf7v7LYoLl4J9cnQpyaqq1KyjBQS Oxc7G+BPjUiVxi3cnxzi8+oOdiebDJdfP9fgQtvWrcazAXAS4Vta9Eun7myLVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778436881; a=rsa-sha256; cv=none; b=JfJjGd1c8vL0oqcc80H2DrHVEq/VQZMsGVflOwwEj3RORYw5ybJOXuQsuORv7YvVn2/sR4 rHlckayGaultdHxt+Iq5RM4PoR57jDxl5RRIDaSivfOWLk1mTHswq3dBBHxOtuGiHDQIi0 x5DxD2Ews6gaezNl77ptTqnciRaOltg1u6rpuHQAjMP7Tf2fglfqa1kT54i3XxlcsMHsZ6 LyTWMwIBzng2Wymq+GXhRKgIindnqzaHhdwP848Eq1JU+ouauRZmSl0xe4bkvRpANMRNaH fwr+a622RFfwMy4ag55kpe1t0mppv/anskzFr0+UH7SlqjLw8bZQF0KLW4aCBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436881; 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=fGQsMtDBvLDyBCL1MUxjlqtuwJwvYmiPsHpNQoITAuU=; b=IVla1wn1xjBX0HwyhoZ8ZLd/h1fmHFMozG4/NBOoKDgLYK2PHSZwzz0ERDlC0dqrUyyFyW o8O5Nn+U23WZm50OwaoPMUw/fg5UfohEzjTu+xVVaw4+kr2Iw+eCIr0YOE2oGK7yjYOgLo WDdAxi7+593FCHpsDZaiELzTrKrVK9l+iePqOLL30rqeY2dyItl7m9nSAg3fcqNDg7xjpd 800QVVNU+CNmwloNQ72tHrjAY5iYzNmNS1LPs4kH6jH9vzfnLWLrtRBCNjJpF82nkmyCZk WXy/OXS+61pPWLWQ24lE1ogwiT4sqikp6Q/CPya6EC5i6pzQZCZl7CfqcYKwNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD9xF1LW5zgdt for ; Sun, 10 May 2026 18:14:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4418e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 18:14:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ea72f6d5a8b9 - main - sys/cdefs.h: move __BEGIN_DECLS/__END_DECLS into a helper sys/_decls.h 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: ea72f6d5a8b9386a09e23fbdc933effb007ca899 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 18:14:41 +0000 Message-Id: <6a00cb11.4418e.735c08d5@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ea72f6d5a8b9386a09e23fbdc933effb007ca899 commit ea72f6d5a8b9386a09e23fbdc933effb007ca899 Author: Konstantin Belousov AuthorDate: 2026-05-08 14:13:35 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-10 18:14:18 +0000 sys/cdefs.h: move __BEGIN_DECLS/__END_DECLS into a helper sys/_decls.h There are situations where nothing from sys/cdefs.h is needed except for the declaration braces. More, the other facilities from sys/cdefs.h might unnecessarly pollute the namespace. Reviewed by: markj, imp Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56889 --- sys/sys/_decls.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ sys/sys/cdefs.h | 8 +------- tools/build/Makefile | 1 + 3 files changed, 48 insertions(+), 7 deletions(-) diff --git a/sys/sys/_decls.h b/sys/sys/_decls.h new file mode 100644 index 000000000000..2ef61671dd70 --- /dev/null +++ b/sys/sys/_decls.h @@ -0,0 +1,46 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 1991, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Berkeley Software Design, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _SYS__DECLS_H_ +#define _SYS__DECLS_H_ + +#if defined(__cplusplus) +#define __BEGIN_DECLS extern "C" { +#define __END_DECLS } +#else +#define __BEGIN_DECLS +#define __END_DECLS +#endif + +#endif diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index a08c50c8439a..d0a34f1bdfc0 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -61,13 +61,7 @@ #define __has_builtin(x) 0 #endif -#if defined(__cplusplus) -#define __BEGIN_DECLS extern "C" { -#define __END_DECLS } -#else -#define __BEGIN_DECLS -#define __END_DECLS -#endif +#include /* * This code has been put in place to help reduce the addition of diff --git a/tools/build/Makefile b/tools/build/Makefile index f0856900b281..d71cc710be87 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -360,6 +360,7 @@ DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h .if ${.MAKE.OS} == "FreeBSD" # Needed to build most of the things below, which include sys/cdefs.h either # directly or transitively +SYSINCS+= ${SRCTOP}/sys/sys/_decls.h SYSINCS+= ${SRCTOP}/sys/sys/_visible.h SYSINCS+= ${SRCTOP}/sys/sys/cdefs.h .endif