git: 910919219716 - main - kqueue: Define older kqueue event types better

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=9109192197166e72ce0c04e5f04fc82f35a82f40

commit 9109192197166e72ce0c04e5f04fc82f35a82f40
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-11-23 17:51:46 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2021-11-23 20:29:24 +0000

    kqueue: Define older kqueue event types better
    
    struct kqueue is designed to live in a restricted namespace, but the
    older compat versions are not. Shift to using unsigned short instead
    of u_short, unsigned int instead of u_int and the __*int*_t types
    instead of the unprefiexed versions.
    
    Sponsored by:           Netflix
    Reviewed by:            brooks
    Differential Revision:  https://reviews.freebsd.org/D33056
---
 sys/sys/event.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/sys/sys/event.h b/sys/sys/event.h
index 7d337d40c1e6..05eddfd681b1 100644
--- a/sys/sys/event.h
+++ b/sys/sys/event.h
@@ -105,29 +105,29 @@ struct freebsd11_kevent {
 
 #if defined(_WANT_KEVENT32) || (defined(_KERNEL) && defined(__LP64__))
 struct kevent32 {
-	uint32_t	ident;		/* identifier for this event */
+	__uint32_t	ident;		/* identifier for this event */
 	short		filter;		/* filter for event */
-	u_short		flags;
-	u_int		fflags;
+	unsigned short	flags;
+	unsigned int	fflags;
 #ifndef __amd64__
-	uint32_t	pad0;
+	__uint32_t	pad0;
 #endif
-	uint32_t	data1, data2;
-	uint32_t	udata;		/* opaque user data identifier */
+	__uint32_t	data1, data2;
+	__uint32_t	udata;		/* opaque user data identifier */
 #ifndef __amd64__
-	uint32_t	pad1;
+	__uint32_t	pad1;
 #endif
-	uint32_t	ext64[8];
+	__uint32_t	ext64[8];
 };
 
 #ifdef _WANT_FREEBSD11_KEVENT
 struct freebsd11_kevent32 {
-	u_int32_t	ident;		/* identifier for this event */
+	__uint32_t	ident;		/* identifier for this event */
 	short		filter;		/* filter for event */
-	u_short		flags;
-	u_int		fflags;
-	int32_t		data;
-	u_int32_t	udata;		/* opaque user data identifier */
+	unsigned short	flags;
+	unsigned int	fflags;
+	__int32_t	data;
+	__uint32_t	udata;		/* opaque user data identifier */
 };
 #endif
 #endif