[src/trunk]: src Don't include <rump/rumpvnode_if.h> from rump.h. It's not n...

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

details:   https://anonhg.NetBSD.org/src/rev/71db8db58a20
branches:  trunk
changeset: 813358:71db8db58a20
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Jan 25 11:45:57 2016 +0000

description:
Don't include <rump/rumpvnode_if.h> from rump.h.  It's not needed
unless you're doing something special, but requires register_t.
Adjust the few places which actually need rumpvnode_if.h.

diffstat:

 lib/libp2k/p2k.c                      |  3 ++-
 lib/libukfs/ukfs.c                    |  3 ++-
 share/examples/rump/ttyserv/ttyserv.c |  3 ++-
 share/examples/rump/umserv/umserv.c   |  3 ++-
 sys/rump/include/rump/rump.h          |  3 +--
 tests/rump/rumpvfs/t_p2kifs.c         |  3 ++-
 6 files changed, 11 insertions(+), 7 deletions(-)

diffs (102 lines):

diff -r 6e392aef06c0 -r 71db8db58a20 lib/libp2k/p2k.c
--- a/lib/libp2k/p2k.c  Mon Jan 25 11:01:17 2016 +0000
+++ b/lib/libp2k/p2k.c  Mon Jan 25 11:45:57 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: p2k.c,v 1.67 2016/01/23 16:39:31 christos Exp $        */
+/*     $NetBSD: p2k.c,v 1.68 2016/01/25 11:45:58 pooka Exp $   */
 
 /*
  * Copyright (c) 2007, 2008, 2009  Antti Kantee.  All Rights Reserved.
@@ -58,6 +58,7 @@
 #include <stdio.h>
 
 #include <rump/rump.h>
+#include <rump/rumpvnode_if.h>
 #include <rump/p2k.h>
 #include <rump/ukfs.h>
 
diff -r 6e392aef06c0 -r 71db8db58a20 lib/libukfs/ukfs.c
--- a/lib/libukfs/ukfs.c        Mon Jan 25 11:01:17 2016 +0000
+++ b/lib/libukfs/ukfs.c        Mon Jan 25 11:45:57 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ukfs.c,v 1.58 2015/06/17 00:15:26 christos Exp $       */
+/*     $NetBSD: ukfs.c,v 1.59 2016/01/25 11:45:57 pooka Exp $  */
 
 /*
  * Copyright (c) 2007, 2008, 2009  Antti Kantee.  All Rights Reserved.
@@ -61,6 +61,7 @@
 #include <rump/ukfs.h>
 
 #include <rump/rump.h>
+#include <rump/rumpvnode_if.h>
 #include <rump/rump_syscalls.h>
 
 #include "ukfs_int_disklabel.h"
diff -r 6e392aef06c0 -r 71db8db58a20 share/examples/rump/ttyserv/ttyserv.c
--- a/share/examples/rump/ttyserv/ttyserv.c     Mon Jan 25 11:01:17 2016 +0000
+++ b/share/examples/rump/ttyserv/ttyserv.c     Mon Jan 25 11:45:57 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ttyserv.c,v 1.2 2010/06/24 13:03:05 hannken Exp $      */
+/*     $NetBSD: ttyserv.c,v 1.3 2016/01/25 11:45:58 pooka Exp $        */
 
 /*
  * Copyright (c) 2009, 2010 Antti Kantee.  All Rights Reserved.
@@ -37,6 +37,7 @@
 #include <dev/pud/pud_msgif.h>
 
 #include <rump/rump.h>
+#include <rump/rumpvnode_if.h>
 
 #include <assert.h>
 #include <err.h>
diff -r 6e392aef06c0 -r 71db8db58a20 share/examples/rump/umserv/umserv.c
--- a/share/examples/rump/umserv/umserv.c       Mon Jan 25 11:01:17 2016 +0000
+++ b/share/examples/rump/umserv/umserv.c       Mon Jan 25 11:45:57 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: umserv.c,v 1.2 2010/06/24 13:03:05 hannken Exp $       */
+/*     $NetBSD: umserv.c,v 1.3 2016/01/25 11:45:58 pooka Exp $ */
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -47,6 +47,7 @@
 #include <dev/pud/pud_msgif.h>
 
 #include <rump/rump.h>
+#include <rump/rumpvnode_if.h>
 
 #include <assert.h>
 #include <err.h>
diff -r 6e392aef06c0 -r 71db8db58a20 sys/rump/include/rump/rump.h
--- a/sys/rump/include/rump/rump.h      Mon Jan 25 11:01:17 2016 +0000
+++ b/sys/rump/include/rump/rump.h      Mon Jan 25 11:45:57 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rump.h,v 1.64 2015/11/01 12:34:28 pooka Exp $  */
+/*     $NetBSD: rump.h,v 1.65 2016/01/25 11:45:57 pooka Exp $  */
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -62,7 +62,6 @@
 typedef RUMP_REGISTER_T register_t;
 #endif
 
-#include <rump/rumpvnode_if.h>
 #include <rump/rumpdefs.h>
 
 /* rumpkern */
diff -r 6e392aef06c0 -r 71db8db58a20 tests/rump/rumpvfs/t_p2kifs.c
--- a/tests/rump/rumpvfs/t_p2kifs.c     Mon Jan 25 11:01:17 2016 +0000
+++ b/tests/rump/rumpvfs/t_p2kifs.c     Mon Jan 25 11:45:57 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: t_p2kifs.c,v 1.4 2014/02/07 15:29:23 hannken Exp $     */
+/*     $NetBSD: t_p2kifs.c,v 1.5 2016/01/25 11:45:57 pooka Exp $       */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -32,6 +32,7 @@
 #include <sys/sysctl.h>
 
 #include <rump/rump.h>
+#include <rump/rumpvnode_if.h>
 #include <rump/rump_syscalls.h>
 
 #include <atf-c.h>