From owner-svn-src-head@freebsd.org  Mon Feb 13 19:00:10 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D0DCACDD59D;
 Mon, 13 Feb 2017 19:00:10 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 76B369E0;
 Mon, 13 Feb 2017 19:00:10 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1DJ096x093711;
 Mon, 13 Feb 2017 19:00:09 GMT (envelope-from ed@FreeBSD.org)
Received: (from ed@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1DJ09lj093710;
 Mon, 13 Feb 2017 19:00:09 GMT (envelope-from ed@FreeBSD.org)
Message-Id: <201702131900.v1DJ09lj093710@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ed set sender to ed@FreeBSD.org
 using -f
From: Ed Schouten <ed@FreeBSD.org>
Date: Mon, 13 Feb 2017 19:00:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r313704 - head/sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Feb 2017 19:00:10 -0000

Author: ed
Date: Mon Feb 13 19:00:09 2017
New Revision: 313704
URL: https://svnweb.freebsd.org/changeset/base/313704

Log:
  Make <sys/event.h> work on its own.
  
  Right now this header file doesn't want to build when included on its
  own, as it depends on some integer types that are only declared
  internally. Switch it over to use <sys/_types.h> and the __*
  counterparts.

Modified:
  head/sys/sys/event.h

Modified: head/sys/sys/event.h
==============================================================================
--- head/sys/sys/event.h	Mon Feb 13 18:52:26 2017	(r313703)
+++ head/sys/sys/event.h	Mon Feb 13 19:00:09 2017	(r313704)
@@ -29,7 +29,8 @@
 #ifndef _SYS_EVENT_H_
 #define _SYS_EVENT_H_
 
-#include <sys/queue.h> 
+#include <sys/_types.h>
+#include <sys/queue.h>
 
 #define EVFILT_READ		(-1)
 #define EVFILT_WRITE		(-2)
@@ -57,11 +58,11 @@
 } while(0)
 
 struct kevent {
-	uintptr_t	ident;		/* identifier for this event */
+	__uintptr_t	ident;		/* identifier for this event */
 	short		filter;		/* filter for event */
-	u_short		flags;
-	u_int		fflags;
-	intptr_t	data;
+	unsigned short	flags;
+	unsigned int	fflags;
+	__intptr_t	data;
 	void		*udata;		/* opaque user data identifier */
 };