d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kqueue: Define older kqueue event types better

Browse Source 
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
This commit is contained in:
Warner Losh 2021-11-23 10:51:46 -07:00
parent 319e9fc642
commit 9109192197
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/sys/event.h
View File

@ -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