From: millert <millert@openbsd.org>
Date: Thu, 21 Dec 2017 21:04:38 +0000 (+0000)
Subject: Expand u_short and u_int to unsigned short and unsigned int
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e7483f3bf35922de55a8182c036b1cc11eaa915f;p=openbsd

Expand u_short and u_int to unsigned short and unsigned int
respectively to avoid compilation errors when one of the POSIX or
X/OPEN version macros is defined.  Also sync the field descriptions
with kqueue.2.  OK deraadt@
---

diff --git a/sys/sys/event.h b/sys/sys/event.h
index a3036a8aa13..c3b2b285bfc 100644
--- a/sys/sys/event.h
+++ b/sys/sys/event.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: event.h,v 1.28 2017/12/18 10:10:53 mpi Exp $	*/
+/*	$OpenBSD: event.h,v 1.29 2017/12/21 21:04:38 millert Exp $	*/
 
 /*-
  * Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org>
@@ -54,9 +54,9 @@
 struct kevent {
 	__uintptr_t	ident;		/* identifier for this event */
 	short		filter;		/* filter for event */
-	u_short		flags;
-	u_int		fflags;
-	__int64_t	data;
+	unsigned short	flags;		/* action flags for kqueue */
+	unsigned int	fflags;		/* filter flag value */
+	__int64_t	data;		/* filter data value */
 	void		*udata;		/* opaque user data identifier */
 };