Module Name: src
Committed By: martin
Date: Mon Aug 26 13:24:19 UTC 2019
Modified Files:
src/sys/sys [netbsd-9]: event.h
Log Message:
Backout pullup of rev.1.33, requested by kamil in ticket #22: this
will need further work, there is still on going discussion in -current,
and this intermediate state breaks 3rd party code.
To generate a diff of this commit:
cvs rdiff -u -r1.32.8.1 -r1.32.8.2 src/sys/sys/event.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/event.h
diff -u src/sys/sys/event.h:1.32.8.1 src/sys/sys/event.h:1.32.8.2
--- src/sys/sys/event.h:1.32.8.1 Tue Aug 6 16:22:04 2019
+++ src/sys/sys/event.h Mon Aug 26 13:24:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: event.h,v 1.32.8.1 2019/08/06 16:22:04 martin Exp $ */
+/* $NetBSD: event.h,v 1.32.8.2 2019/08/26 13:24:19 martin Exp $ */
/*-
* Copyright (c) 1999,2000,2001 Jonathan Lemon <[email protected]>
@@ -55,6 +55,10 @@ struct kevent {
intptr_t udata; /* opaque user data identifier */
};
+#define EV_SET(kevp, ident, filter, flags, fflags, data, udata) \
+ _EV_SET((kevp), __CAST(uintptr_t, (ident)), (filter), (flags), \
+ (fflags), (data), __CAST(intptr_t, (udata)))
+
static __inline void
_EV_SET(struct kevent *_kevp, uintptr_t _ident, uint32_t _filter,
uint32_t _flags, uint32_t _fflags, int64_t _data, intptr_t _udata)
@@ -67,24 +71,6 @@ _EV_SET(struct kevent *_kevp, uintptr_t
_kevp->udata = _udata;
}
-#ifdef __cplusplus
-#define EV_SET(kevp, ident, filter, flags, fflags, data, udata) \
- _EV_SET((kevp), __CAST(uintptr_t, (ident)), (filter), (flags), \
- (fflags), (data), (udata))
-
-static __inline void
-_EV_SET(struct kevent *_kevp, uintptr_t _ident, uint32_t _filter,
- uint32_t _flags, uint32_t _fflags, int64_t _data, void *_udata)
-{
- _EV_SET(_kevp, _ident, _filter, _flags, _fflags, _data,
- reinterpret_cast<intptr_t>(_udata));
-}
-#else
-#define EV_SET(kevp, ident, filter, flags, fflags, data, udata) \
- _EV_SET((kevp), __CAST(uintptr_t, (ident)), (filter), (flags), \
- (fflags), (data), __CAST(intptr_t, (udata)))
-#endif
-
/* actions */
#define EV_ADD 0x0001U /* add event to kq (implies ENABLE) */
#define EV_DELETE 0x0002U /* delete event from kq */
