Module Name: src
Committed By: pooka
Date: Mon Jan 25 11:45:58 UTC 2016
Modified Files:
src/lib/libp2k: p2k.c
src/lib/libukfs: ukfs.c
src/share/examples/rump/ttyserv: ttyserv.c
src/share/examples/rump/umserv: umserv.c
src/sys/rump/include/rump: rump.h
src/tests/rump/rumpvfs: t_p2kifs.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/lib/libp2k/p2k.c
cvs rdiff -u -r1.58 -r1.59 src/lib/libukfs/ukfs.c
cvs rdiff -u -r1.2 -r1.3 src/share/examples/rump/ttyserv/ttyserv.c
cvs rdiff -u -r1.2 -r1.3 src/share/examples/rump/umserv/umserv.c
cvs rdiff -u -r1.64 -r1.65 src/sys/rump/include/rump/rump.h
cvs rdiff -u -r1.4 -r1.5 src/tests/rump/rumpvfs/t_p2kifs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libp2k/p2k.c
diff -u src/lib/libp2k/p2k.c:1.67 src/lib/libp2k/p2k.c:1.68
--- src/lib/libp2k/p2k.c:1.67 Sat Jan 23 16:39:31 2016
+++ src/lib/libp2k/p2k.c Mon Jan 25 11:45:58 2016
@@ -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>
Index: src/lib/libukfs/ukfs.c
diff -u src/lib/libukfs/ukfs.c:1.58 src/lib/libukfs/ukfs.c:1.59
--- src/lib/libukfs/ukfs.c:1.58 Wed Jun 17 00:15:26 2015
+++ src/lib/libukfs/ukfs.c Mon Jan 25 11:45:57 2016
@@ -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"
Index: src/share/examples/rump/ttyserv/ttyserv.c
diff -u src/share/examples/rump/ttyserv/ttyserv.c:1.2 src/share/examples/rump/ttyserv/ttyserv.c:1.3
--- src/share/examples/rump/ttyserv/ttyserv.c:1.2 Thu Jun 24 13:03:05 2010
+++ src/share/examples/rump/ttyserv/ttyserv.c Mon Jan 25 11:45:58 2016
@@ -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>
Index: src/share/examples/rump/umserv/umserv.c
diff -u src/share/examples/rump/umserv/umserv.c:1.2 src/share/examples/rump/umserv/umserv.c:1.3
--- src/share/examples/rump/umserv/umserv.c:1.2 Thu Jun 24 13:03:05 2010
+++ src/share/examples/rump/umserv/umserv.c Mon Jan 25 11:45:58 2016
@@ -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>
Index: src/sys/rump/include/rump/rump.h
diff -u src/sys/rump/include/rump/rump.h:1.64 src/sys/rump/include/rump/rump.h:1.65
--- src/sys/rump/include/rump/rump.h:1.64 Sun Nov 1 12:34:28 2015
+++ src/sys/rump/include/rump/rump.h Mon Jan 25 11:45:57 2016
@@ -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 struct prop_dictionary *prop_dic
typedef RUMP_REGISTER_T register_t;
#endif
-#include <rump/rumpvnode_if.h>
#include <rump/rumpdefs.h>
/* rumpkern */
Index: src/tests/rump/rumpvfs/t_p2kifs.c
diff -u src/tests/rump/rumpvfs/t_p2kifs.c:1.4 src/tests/rump/rumpvfs/t_p2kifs.c:1.5
--- src/tests/rump/rumpvfs/t_p2kifs.c:1.4 Fri Feb 7 15:29:23 2014
+++ src/tests/rump/rumpvfs/t_p2kifs.c Mon Jan 25 11:45:57 2016
@@ -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>
