git: 029a09f18032 - main - sys/_types.h: Actually unbreak gcc build
Date: Sun, 30 Nov 2025 10:31:30 UTC
The branch main has been updated by des:
URL: https://cgit.FreeBSD.org/src/commit/?id=029a09f18032353a9ae874590b879322efc6e53a
commit 029a09f18032353a9ae874590b879322efc6e53a
Author: Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2025-11-30 10:30:45 +0000
Commit: Dag-Erling Smørgrav <des@FreeBSD.org>
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