Index: sys/sys/event.h
===================================================================
RCS file: /cvsroot/src/sys/sys/event.h,v
retrieving revision 1.26
diff -u -r1.26 event.h
--- sys/sys/event.h	31 Jan 2016 04:40:01 -0000	1.26
+++ sys/sys/event.h	30 May 2017 22:31:26 -0000
@@ -45,17 +45,6 @@
 #define	EVFILT_TIMER		6U	/* arbitrary timer (in ms) */
 #define	EVFILT_SYSCOUNT		7U	/* number of filters */
 
-#define	EV_SET(kevp, a, b, c, d, e, f)					\
-do {									\
-	(kevp)->ident = (a);						\
-	(kevp)->filter = (b);						\
-	(kevp)->flags = (c);						\
-	(kevp)->fflags = (d);						\
-	(kevp)->data = (e);						\
-	(kevp)->udata = (f);						\
-} while (/* CONSTCOND */ 0)
-
-
 struct kevent {
 	uintptr_t	ident;		/* identifier for this event */
 	uint32_t	filter;		/* filter for event */
@@ -65,6 +54,18 @@
 	intptr_t	udata;		/* opaque user data identifier */
 };
 
+static __inline void
+EV_SET(struct kevent *_kevp, uint32_t _ident, uint32_t _filter,
+       uint32_t _flags, uint32_t _fflags, int64_t _data, intptr_t _udata)
+{
+	_kevp->ident = _ident;
+	_kevp->filter = _filter;
+	_kevp->flags = _flags;
+	_kevp->fflags = _fflags;
+	_kevp->data = _data;
+	_kevp->udata = _udata;
+}
+
 /* actions */
 #define	EV_ADD		0x0001U		/* add event to kq (implies ENABLE) */
 #define	EV_DELETE	0x0002U		/* delete event from kq */