mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-06 16:40:47 +00:00
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
(cherry picked from commit 9109192197
)
This commit is contained in:
parent
815c26d4e1
commit
af92db385c
|
@ -104,29 +104,29 @@ struct kevent_freebsd11 {
|
|||
|
||||
#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 kevent32_freebsd11 {
|
||||
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
|
||||
|
|
Loading…
Reference in a new issue