The branch main has been updated by des:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=19728f31ae421f40e2b0b0c775f4eedd7f927be0

commit 19728f31ae421f40e2b0b0c775f4eedd7f927be0
Author:     Dag-Erling Smørgrav <[email protected]>
AuthorDate: 2025-11-28 19:47:04 +0000
Commit:     Dag-Erling Smørgrav <[email protected]>
CommitDate: 2025-11-28 19:47:22 +0000

    sys/_types.h: Unbreak gcc build
    
    We can't assume that <sys/cdefs.h> 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

Reply via email to