[src/trunk]: src Revert previous change so builds can resume.

[sevan <sevan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b2fdfd787298
branches:  trunk
changeset: 823818:b2fdfd787298
user:      sevan <sevan%NetBSD.org@localhost>
date:      Wed May 10 08:48:46 2017 +0000

description:
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.

diffstat:

 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(-)

diffs (87 lines):

diff -r e1086106127f -r b2fdfd787298 lib/librumpclient/Makefile
--- a/lib/librumpclient/Makefile        Wed May 10 08:46:39 2017 +0000
+++ b/lib/librumpclient/Makefile        Wed May 10 08:48:46 2017 +0000
@@ -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 @@
 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 -r e1086106127f -r b2fdfd787298 lib/librumphijack/Makefile
--- a/lib/librumphijack/Makefile        Wed May 10 08:46:39 2017 +0000
+++ b/lib/librumphijack/Makefile        Wed May 10 08:48:46 2017 +0000
@@ -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 @@
 
 SRCS=          hijack.c hijackdlsym.c
 
-CPPFLAGS+=     -D_DIAGNOSTIC -D_REENTRANT
+CPPFLAGS+=     -D_DIAGNOSTIC -D_REENTRANT -D_KERNTYPES
 
 WARNS?=                5
 
diff -r e1086106127f -r b2fdfd787298 lib/librumpuser/Makefile
--- a/lib/librumpuser/Makefile  Wed May 10 08:46:39 2017 +0000
+++ b/lib/librumpuser/Makefile  Wed May 10 08:48:46 2017 +0000
@@ -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 @@
 LIBDO.${lib}=  _external
 LIBDPLIBS+=    ${lib} lib
 .endfor
-CPPFLAGS+=     -DLIBRUMPUSER
+CPPFLAGS+=     -DLIBRUMPUSER -D_KERNTYPES
 #CPPFLAGS+=    -D_DIAGNOSTIC
 
 
diff -r e1086106127f -r b2fdfd787298 usr.bin/rump_allserver/Makefile
--- a/usr.bin/rump_allserver/Makefile   Wed May 10 08:46:39 2017 +0000
+++ b/usr.bin/rump_allserver/Makefile   Wed May 10 08:48:46 2017 +0000
@@ -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 @@
 
 LDADD+=        ${RUMPDEVLDADD} ${RUMPFSLDADD} ${RUMPKERNLDADD} ${RUMPNETLDADD}
 LDADD+= -lrumpdev -lrumpvfs -lrumpnet -lrump -lrumpuser -lpthread
+CPPFLAGS+=     -D_KERNTYPES
 
 .include <bsd.prog.mk>
diff -r e1086106127f -r b2fdfd787298 usr.bin/rump_server/Makefile
--- a/usr.bin/rump_server/Makefile      Wed May 10 08:46:39 2017 +0000
+++ b/usr.bin/rump_server/Makefile      Wed May 10 08:48:46 2017 +0000
@@ -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 @@
 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