[src/trunk]: src Do not define _KERNTYPES as this breaks build with buildrump...

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

details:   https://anonhg.NetBSD.org/src/rev/03ba3f648c32
branches:  trunk
changeset: 353499:03ba3f648c32
user:      sevan <sevan%NetBSD.org@localhost>
date:      Wed May 10 01:11:51 2017 +0000

description:
Do not define _KERNTYPES as this breaks build with buildrump.sh due to
conflicting types for register_t.
Closes PR kern/52206
Steered in the right direction by christos.

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, 8 insertions(+), 10 deletions(-)

diffs (87 lines):

diff -r 9fda0dc26a01 -r 03ba3f648c32 lib/librumpclient/Makefile
--- a/lib/librumpclient/Makefile        Tue May 09 23:26:49 2017 +0000
+++ b/lib/librumpclient/Makefile        Wed May 10 01:11:51 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2016/01/23 21:22:46 christos Exp $
+#      $NetBSD: Makefile,v 1.12 2017/05/10 01:11:51 sevan Exp $
 #
 
 .PATH: ${.CURDIR}/../../sys/rump/librump/rumpkern
@@ -17,7 +17,7 @@
 LIBDPLIBS+=    ${lib} lib
 .endfor
 
-CPPFLAGS+=     -DRUMP_CLIENT -D_KERNTYPES
+CPPFLAGS+=     -DRUMP_CLIENT
 CPPFLAGS+=     -I${.OBJDIR} -I${.CURDIR}
 CPPFLAGS+=     -I${.CURDIR}/../librumpuser
 SRCS=          rumpclient.c
diff -r 9fda0dc26a01 -r 03ba3f648c32 lib/librumphijack/Makefile
--- a/lib/librumphijack/Makefile        Tue May 09 23:26:49 2017 +0000
+++ b/lib/librumphijack/Makefile        Wed May 10 01:11:51 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.17 2016/01/23 21:22:46 christos Exp $
+#      $NetBSD: Makefile,v 1.18 2017/05/10 01:11:51 sevan Exp $
 #
 
 LIB=           rumphijack
@@ -10,7 +10,7 @@
 
 SRCS=          hijack.c hijackdlsym.c
 
-CPPFLAGS+=     -D_DIAGNOSTIC -D_REENTRANT -D_KERNTYPES
+CPPFLAGS+=     -D_DIAGNOSTIC -D_REENTRANT
 
 WARNS?=                5
 
diff -r 9fda0dc26a01 -r 03ba3f648c32 lib/librumpuser/Makefile
--- a/lib/librumpuser/Makefile  Tue May 09 23:26:49 2017 +0000
+++ b/lib/librumpuser/Makefile  Wed May 10 01:11:51 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.24 2016/01/23 21:22:46 christos Exp $
+#      $NetBSD: Makefile,v 1.25 2017/05/10 01:11:52 sevan Exp $
 #
 
 .include <bsd.own.mk>
@@ -19,7 +19,7 @@
 LIBDO.${lib}=  _external
 LIBDPLIBS+=    ${lib} lib
 .endfor
-CPPFLAGS+=     -DLIBRUMPUSER -D_KERNTYPES
+CPPFLAGS+=     -DLIBRUMPUSER
 #CPPFLAGS+=    -D_DIAGNOSTIC
 
 
diff -r 9fda0dc26a01 -r 03ba3f648c32 usr.bin/rump_allserver/Makefile
--- a/usr.bin/rump_allserver/Makefile   Tue May 09 23:26:49 2017 +0000
+++ b/usr.bin/rump_allserver/Makefile   Wed May 10 01:11:51 2017 +0000
@@ -1,11 +1,10 @@
-#      $NetBSD: Makefile,v 1.8 2016/01/23 21:22:49 christos Exp $
+#      $NetBSD: Makefile,v 1.9 2017/05/10 01:11:52 sevan Exp $
 #
 
 PROG=  rump_allserver
 MLINKS+=rump_allserver.1 rump_server.1
 
 RUMPTOP=${.CURDIR}/../../sys/rump
-CPPFLAGS+=     -D_KERNTYPES
 
 .include "${RUMPTOP}/dev/Makefile.rumpdevcomp"
 .include "${RUMPTOP}/fs/Makefile.rumpfscomp"
diff -r 9fda0dc26a01 -r 03ba3f648c32 usr.bin/rump_server/Makefile
--- a/usr.bin/rump_server/Makefile      Tue May 09 23:26:49 2017 +0000
+++ b/usr.bin/rump_server/Makefile      Wed May 10 01:11:51 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2016/01/23 21:22:50 christos Exp $
+#      $NetBSD: Makefile,v 1.10 2017/05/10 01:11:52 sevan Exp $
 #
 
 .PATH: ${.CURDIR}/../rump_allserver
@@ -7,7 +7,6 @@
 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