From nobody Sun Nov 30 10:31:30 2025 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 4dK3H72Cl9z6J7yy for ; Sun, 30 Nov 2025 10:31:31 +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 4dK3H65f5Mz3gYy for ; Sun, 30 Nov 2025 10:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764498690; 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=dSY6Pxy9/BHnME7IYj43fmiJv5aswT8e/YC4YnZaXIo=; b=W20+YZ/CniZKZOFNNEa9ifYPpwqGjWC6BCcO/HAhuDDYsp8NCzpzUnUXhLtyyBqsMjQPyz PervdIls5K4K6HoPN+oRobYfe8MtDLqRDDzpnDJNDr/cdl4smcmHYPXD0VHGLs+bjTwFEO bRjkAGKH1gMGOrKiccGk7B08MsTtMgLMCWwxQoG6vSz/RILtjRl3wm5+ObVgVFXdfayn+8 oKjnskahdYkV2IWq3rMex8PIJJ0G9TvMMiF9xGJVv0No3qUq/RfP27GYNm0SEKCxUJRmyd NbA3Sp2tuSXTjabt9+8/gt00vor6pdErre2fgAkbsZYSoxCzIrUgOXeGT6cWEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764498690; 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=dSY6Pxy9/BHnME7IYj43fmiJv5aswT8e/YC4YnZaXIo=; b=yykltMZxJvQlfOCPUwJoqDpCLYbEHWsq1S4Sf5T0HFbWLpVf57brPXE8v9BHT48BIWyoLd mljdsqtKbF02QsTJPb0nZK2sJqwZbRypw1SfQhX74sumBUIZMf0+TO17xvNiXLwsfn5tHu ZHEu5GIlz2MyVnfOlYADv83UOOMXMFfMdI2RPZrHfaclOpYifdvJTYyeGUW7VSFI3AIlyM HOdAFJ1yfMRq5FypvcwQfx7Wy25dn8SArPTE/xBxgH5wQgTH/ejpjhUJ7+CvPi8UiG/d1l r2/s1a7D0vQMqIEzM6rOqlRb7e1qMBgkDI1cBcm2RknF4dJ1daAhvmVghOZdgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764498690; a=rsa-sha256; cv=none; b=j9kvk+sk39x1TzISiURgML66hhWQtuhSytZYJFXEd7lQZcu8Wqtazv/jOvL2EA+VqKqCci hZkKmxgeSemtg4XGHHWeUKWKO5FGBudDJQ5RlaxyHU4/aKyZqKH3jAuRuB07fbMqNl2w7h 6c+Sbg81qiIw3hDuFY/MUm47U6Y24+Ki+p3+TLU3tyuO4xGi9MYt10N8ojD+ybNgRD+3Vw NGHGumTCECIPrt5VQxSluzclokNZKJvnohY9zALVAZJiXf5J4PMlOx9Nk4Uv9tb/OOEz0Z LGu+QlSYLV1Y9m1R8hoqL6lQSilkhRo1qgjay1DV5TuwqS3O+QKNG3OcJLRIug== 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 4dK3H64zW5zWg2 for ; Sun, 30 Nov 2025 10:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 367c7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 30 Nov 2025 10:31:30 +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: 029a09f18032 - main - sys/_types.h: Actually unbreak gcc build 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 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: 029a09f18032353a9ae874590b879322efc6e53a Auto-Submitted: auto-generated Date: Sun, 30 Nov 2025 10:31:30 +0000 Message-Id: <692c1d02.367c7.22c28c58@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=029a09f18032353a9ae874590b879322efc6e53a commit 029a09f18032353a9ae874590b879322efc6e53a Author: Dag-Erling Smørgrav AuthorDate: 2025-11-30 10:30:45 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-30 10:31:09 +0000 sys/_types.h: Actually unbreak gcc build Fixes: 19728f31ae42 ("sys/_types.h: Unbreak gcc build") Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D53986 --- sys/sys/_types.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/sys/_types.h b/sys/sys/_types.h index f3c80957af34..4e217704ceb6 100644 --- a/sys/sys/_types.h +++ b/sys/sys/_types.h @@ -161,7 +161,10 @@ typedef int __cpulevel_t; /* level parameter for cpuset. */ typedef int __cpusetid_t; /* cpuset identifier. */ typedef __int64_t __daddr_t; /* bwrite(3), FIOBMAP2, etc */ -#if !defined(__has_feature) || !__has_feature(capabilities) +#ifndef __has_feature +#define __has_feature(x) 0 +#endif +#if !__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