From 979875ac741a2e4a2a5dee53029c0fa80ef2bffb Mon Sep 17 00:00:00 2001
From: sevan <sevan@NetBSD.org>
Date: Wed, 10 May 2017 08:48:46 +0000
Subject: [PATCH] Revert previous change so builds can resume. _KERNTYPES needs
 to be defined for NetBSD builds to succeed. _KERNTYPES must not be defined
 for buildrum.sh builds to succeed.

---
 lib/librumpclient/Makefile      | 4 ++--
 lib/librumphijack/Makefile      | 4 ++--
 lib/librumpuser/Makefile        | 4 ++--
 usr.bin/rump_allserver/Makefile | 3 ++-
 usr.bin/rump_server/Makefile    | 3 ++-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/librumpclient/Makefile b/lib/librumpclient/Makefile
index 2cc907431e8f..3b195092f239 100644
--- a/lib/librumpclient/Makefile
+++ b/lib/librumpclient/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2017/05/10 01:11:51 sevan Exp $
+#	$NetBSD: Makefile,v 1.13 2017/05/10 08:48:46 sevan Exp $
 #
 
 .PATH:	${.CURDIR}/../../sys/rump/librump/rumpkern
@@ -17,7 +17,7 @@ LIBDO.${lib}=	_external
 LIBDPLIBS+=	${lib} lib
 .endfor
 
-CPPFLAGS+=	-DRUMP_CLIENT
+CPPFLAGS+=	-DRUMP_CLIENT -D_KERNTYPES
 CPPFLAGS+=	-I${.OBJDIR} -I${.CURDIR}
 CPPFLAGS+=	-I${.CURDIR}/../librumpuser
 SRCS=		rumpclient.c
diff --git a/lib/librumphijack/Makefile b/lib/librumphijack/Makefile
index 25fc082182f4..77ce45a661b5 100644
--- a/lib/librumphijack/Makefile
+++ b/lib/librumphijack/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2017/05/10 01:11:51 sevan Exp $
+#	$NetBSD: Makefile,v 1.19 2017/05/10 08:48:46 sevan Exp $
 #
 
 LIB=		rumphijack
@@ -10,7 +10,7 @@ MAN=		rumphijack.3
 
 SRCS=		hijack.c hijackdlsym.c
 
-CPPFLAGS+=	-D_DIAGNOSTIC -D_REENTRANT
+CPPFLAGS+=	-D_DIAGNOSTIC -D_REENTRANT -D_KERNTYPES
 
 WARNS?=		5
 
diff --git a/lib/librumpuser/Makefile b/lib/librumpuser/Makefile
index fdd5006b319c..9f3927a35e77 100644
--- a/lib/librumpuser/Makefile
+++ b/lib/librumpuser/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.25 2017/05/10 01:11:52 sevan Exp $
+#	$NetBSD: Makefile,v 1.26 2017/05/10 08:48:46 sevan Exp $
 #
 
 .include <bsd.own.mk>
@@ -19,7 +19,7 @@ LIBDPLIBS+=	pthread ${.CURDIR}/../libpthread
 LIBDO.${lib}=	_external
 LIBDPLIBS+=	${lib} lib
 .endfor
-CPPFLAGS+=	-DLIBRUMPUSER
+CPPFLAGS+=	-DLIBRUMPUSER -D_KERNTYPES
 #CPPFLAGS+=	-D_DIAGNOSTIC
 
 
diff --git a/usr.bin/rump_allserver/Makefile b/usr.bin/rump_allserver/Makefile
index af2ea27c1efe..b8b6420d8a64 100644
--- a/usr.bin/rump_allserver/Makefile
+++ b/usr.bin/rump_allserver/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2017/05/10 01:11:52 sevan Exp $
+#	$NetBSD: Makefile,v 1.10 2017/05/10 08:48:46 sevan Exp $
 #
 
 PROG=	rump_allserver
@@ -13,5 +13,6 @@ RUMPTOP=${.CURDIR}/../../sys/rump
 
 LDADD+=	${RUMPDEVLDADD} ${RUMPFSLDADD} ${RUMPKERNLDADD} ${RUMPNETLDADD}
 LDADD+= -lrumpdev -lrumpvfs -lrumpnet -lrump -lrumpuser -lpthread
+CPPFLAGS+= 	-D_KERNTYPES
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/rump_server/Makefile b/usr.bin/rump_server/Makefile
index 29461d3c8148..2c047fb3323f 100644
--- a/usr.bin/rump_server/Makefile
+++ b/usr.bin/rump_server/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2017/05/10 01:11:52 sevan Exp $
+#	$NetBSD: Makefile,v 1.11 2017/05/10 08:48:46 sevan Exp $
 #
 
 .PATH: ${.CURDIR}/../rump_allserver
@@ -7,6 +7,7 @@ PROG=		rump_server
 SRCS=		rump_allserver.c
 NOMAN=		installed by ../rump_allserver
 
+CPPFLAGS+= 	-D_KERNTYPES
 LDADD+=		-Wl,--whole-archive -lrumpkern_sysproxy -lrump \
 		-lrumpuser -Wl,--no-whole-archive -lpthread