kgess-mirror/freebsd-src
1
0
Fork 0
mirror of https://git.freebsd.org/src.git synced 2026-01-11 19:57:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

sys/_types.h: avoid use of __has_feature()

Browse source 
Only fairly recent GCC versions support and sys/_types.h must work with
quite old compilers and without sys/cdef.h being included.  The prior
workaround works fine, but we can have the same effect with compiler
macro definitions.  In this specific case, compilers that define the
__intcap_t builtin type will define __SIZEOF_INTCAP__.

This reverts commit 029a09f180
This reverts commit 19728f31ae

Reviewed by:	imp, des, kib, emaste
Effort:		CHERI upstreaming
Fixes:		85ab981a8e ("sys/_types.h: define fallback __(u)intcap_t")
Sponsored by:	Innovate UK
Differential Revision:	https://reviews.freebsd.org/D54009
This commit is contained in:
Brooks Davis 2026-01-09 14:41:21 +00:00
parent 31e7dc6b9a
commit 0a64d16cef
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/sys/_types.h
View file

@ -161,10 +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 */
#ifndef __has_feature
#define __has_feature(x) 0
#endif
#if !__has_feature(capabilities)
#ifndef __SIZEOF_INTCAP__
/*
* 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