The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=55513a1b6e4b46cc5f19bbf35980ff0db874a93b
commit 55513a1b6e4b46cc5f19bbf35980ff0db874a93b Author: Brooks Davis <[email protected]> AuthorDate: 2024-03-18 21:45:42 +0000 Commit: Brooks Davis <[email protected]> CommitDate: 2024-03-19 23:13:26 +0000 sys/acl.h: move main typedefs to sys/_types.h Make __ prefixed versions available without the pollution of sys/acl.h (and by extension sys/param.h). Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44382 --- sys/sys/_types.h | 9 +++++++++ sys/sys/acl.h | 14 +++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/sys/sys/_types.h b/sys/sys/_types.h index 769451299b19..c84b84edd2b8 100644 --- a/sys/sys/_types.h +++ b/sys/sys/_types.h @@ -187,6 +187,15 @@ typedef struct { #endif } __max_align_t; +/* Types for sys/acl.h */ +typedef __uint32_t __acl_tag_t; +typedef __uint32_t __acl_perm_t; +typedef __uint16_t __acl_entry_type_t; +typedef __uint16_t __acl_flag_t; +typedef __uint32_t __acl_type_t; +typedef __uint32_t *__acl_permset_t; +typedef __uint16_t *__acl_flagset_t; + typedef __uint64_t __dev_t; /* device number */ typedef __uint32_t __fixpt_t; /* fixed point number */ diff --git a/sys/sys/acl.h b/sys/sys/acl.h index f679808dceca..66517cff543e 100644 --- a/sys/sys/acl.h +++ b/sys/sys/acl.h @@ -44,13 +44,13 @@ * POSIX.1e and NFSv4 ACL types and related constants. */ -typedef uint32_t acl_tag_t; -typedef uint32_t acl_perm_t; -typedef uint16_t acl_entry_type_t; -typedef uint16_t acl_flag_t; -typedef int acl_type_t; -typedef int *acl_permset_t; -typedef uint16_t *acl_flagset_t; +typedef __acl_tag_t acl_tag_t; +typedef __acl_perm_t acl_perm_t; +typedef __acl_entry_type_t acl_entry_type_t; +typedef __acl_flag_t acl_flag_t; +typedef __acl_type_t acl_type_t; +typedef __acl_permset_t acl_permset_t; +typedef __acl_flagset_t acl_flagset_t; /* * With 254 entries, "struct acl_t_struct" is exactly one 4kB page big.
