[src/netbsd-9]: src/sys/sys Backout pullup of rev.1.33, requested by kamil in...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8ce4e573883e
branches:  netbsd-9
changeset: 1000734:8ce4e573883e
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Aug 26 13:24:19 2019 +0000

description:
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.

diffstat:

 sys/sys/event.h |  24 +++++-------------------
 1 files changed, 5 insertions(+), 19 deletions(-)

diffs (45 lines):

diff -r 966549a7ac41 -r 8ce4e573883e sys/sys/event.h
--- a/sys/sys/event.h   Fri Aug 23 04:24:00 2019 +0000
+++ b/sys/sys/event.h   Mon Aug 26 13:24:19 2019 +0000
@@ -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 <jlemon%FreeBSD.org@localhost>
@@ -55,6 +55,10 @@
        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 @@
        _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 */