Index: cdefs.h
===================================================================
RCS file: /cvsroot/src/sys/sys/cdefs.h,v
retrieving revision 1.141
diff -u -r1.141 cdefs.h
--- cdefs.h	21 Feb 2019 21:34:05 -0000	1.141
+++ cdefs.h	31 Jul 2019 22:08:18 -0000
@@ -612,9 +612,11 @@
  * NOT to be used in code.
  */
 #ifdef __cplusplus
-#define __CAST(__dt, __st)	static_cast<__dt>(__st)
+#define __CAST(__dt, __st)		static_cast<__dt>(__st)
+#define __REINTERPRET_CAST(__dt, __st)	reinterpret_cast<__dt>(__st)
 #else
-#define __CAST(__dt, __st)	((__dt)(__st))
+#define __CAST(__dt, __st)		((__dt)(__st))
+#define __REINTERPRET_CAST(__dt, __st)	static_cast<__dt>(__st)
 #endif
 
 #define __CASTV(__dt, __st)	__CAST(__dt, __CAST(void *, __st))
Index: event.h
===================================================================
RCS file: /cvsroot/src/sys/sys/event.h,v
retrieving revision 1.32
diff -u -r1.32 event.h
--- event.h	9 Jan 2018 03:31:13 -0000	1.32
+++ event.h	31 Jul 2019 22:08:18 -0000
@@ -57,7 +57,7 @@
 
 #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)))
+    (fflags), (data), __REINTERPRET_CAST(intptr_t, (udata)))
 
 static __inline void
 _EV_SET(struct kevent *_kevp, uintptr_t _ident, uint32_t _filter,