From nobody Fri Nov 28 19:49:02 2025 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 4dJ3lL4L0Gz6J8lD for ; Fri, 28 Nov 2025 19:49:02 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dJ3lL2ltCz3Vcs for ; Fri, 28 Nov 2025 19:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764359342; 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=F5vqkuQjJo6lZk3yNt5odnLVsTyJAbujsGUG/6JXURY=; b=qZEg5Ni2QzhELqTCTz2Es5uvYoAGhQLA/NA6Bo6aVIb/0bmQZh2LgojlKtuHFCtkBb+1Zp u8TmchANnHRWPsFtkZZQBmbP+rMyWmZSalPVkn45UUNV3GqjnFHKJbAzy0x++sOKYUCXeZ XgOtbH7fZMSIomYtg4EdHpj+NwoTWFCOj13Ip8kRmderCuxBIGY7zFG8EMn0VX3JoeWXAu vnsbRmstpSCkLw989kpthB4146ii1I6yjr8xck3HktGIeBuBJFQ7WrPqkgEnM3BR0FgDgw s5aaS5fsMXwo6QF/fb+h7voQjYlCVzAnZdeJnLYt5xJUKVyZo95cXzOLfasrcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764359342; 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=F5vqkuQjJo6lZk3yNt5odnLVsTyJAbujsGUG/6JXURY=; b=twRdFgQ3OLlqoZM/KiI35GZIDk+dwqZwel7Vh8RDaWFgH2fLwq3FCH3YFzeumqrsbwyniS ntUOgIHKXNa5GanXvkzFgM8FAaLC+H5jejYq8f10s8w+xx0Uw7c59xpA4P2ddJuzWghiNk C8c0SAgumAxopxuwT3JsaV+qNhoctzw7z4hqAVeZeY9G2B3vQ2bf733XL5GcTqXY2xpqZ8 YOj/ulBR6TEgFulEX4Yv/qTE48DgDZzh2D0t32fCFNPRoTVRuiIA4oJYNgkwd2euUa6Axe UPHp00AfeyTN5eFuXdDxS7P1af5VjKHS3YAjRl1/G7i4/ls+7bd/wFD/KVPIog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764359342; a=rsa-sha256; cv=none; b=nZ0wMq/XkeeuOkY3kKAVj5/utjxZJsCx/ql/OiocvKr+OyyPxhmsJ2C9y42VSYxaz8w9eT hSvuTdwUnb4uLAcdjmyhX9Ao19PU26Hg18LwwGrV/vAPkuPr2vQTnp/alat5kjF8pwKOWU tjHsd0Ehkz/aOnIZktpEl/QAKdYrDTRoOLvtf2UKHSquuadUCHpMclYj6M7mtxGBm9hJjp 6tC5xw61RVZXesyFT6ZVKOyEg1ceBfL85jRCTcBRXnhi5mO+QZ6GwxuFeZKj2pq9Afo1Ke vRTZs+q7+rvIDXpGBJlRBYFEym+68Vxj4+gV+3A53Jm65jGzDLmm56rzCkMaQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dJ3lL2Hxdz1g8 for ; Fri, 28 Nov 2025 19:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2962d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 28 Nov 2025 19:49:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 19728f31ae42 - main - sys/_types.h: Unbreak gcc build 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19728f31ae421f40e2b0b0c775f4eedd7f927be0 Auto-Submitted: auto-generated Date: Fri, 28 Nov 2025 19:49:02 +0000 Message-Id: <6929fcae.2962d.8015a0f@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=19728f31ae421f40e2b0b0c775f4eedd7f927be0 commit 19728f31ae421f40e2b0b0c775f4eedd7f927be0 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-28 19:47:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-28 19:47:22 +0000 sys/_types.h: Unbreak gcc build We can't assume that is in scope. Fixes: 85ab981a8e4e ("sys/_types.h: define fallback __(u)intcap_t") Reviewed by: olce, imp, emaste Differential Revision: https://reviews.freebsd.org/D53980 --- sys/sys/_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/_types.h b/sys/sys/_types.h index e368f44f950e..f3c80957af34 100644 --- a/sys/sys/_types.h +++ b/sys/sys/_types.h @@ -161,7 +161,7 @@ typedef int __cpulevel_t; /* level parameter for cpuset. */ typedef int __cpusetid_t; /* cpuset identifier. */ typedef __int64_t __daddr_t; /* bwrite(3), FIOBMAP2, etc */ -#if !__has_feature(capabilities) +#if !defined(__has_feature) || !__has_feature(capabilities) /* * On non-CHERI systems, define __(u)intcap_t to __(u)intptr_t so that * hybrid-C code which needs to be explicitly aware of capabilities can