Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/lib/libp2k/p2k.c,v
rcsdiff: /ftp/cvs/cvsroot/src/lib/libp2k/p2k.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.57
retrieving revision 1.57.2.2
diff -u -p -r1.57 -r1.57.2.2
--- src/lib/libp2k/p2k.c	2012/08/16 09:25:44	1.57
+++ src/lib/libp2k/p2k.c	2013/02/25 00:27:59	1.57.2.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: p2k.c,v 1.57 2012/08/16 09:25:44 manu Exp $	*/
+/*	$NetBSD: p2k.c,v 1.57.2.2 2013/02/25 00:27:59 tls Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008, 2009  Antti Kantee.  All Rights Reserved.
@@ -651,7 +651,7 @@ p2k_fs_fhtonode(struct puffs_usermount *
 	struct mount *mp = p2m->p2m_mp;
 	struct p2k_node *p2n;
 	struct vnode *vp;
-	enum vtype vtype;
+	enum rump_vtype vtype;
 	voff_t vsize;
 	uint64_t rdev; /* XXX: allows running this on NetBSD 5.0 */
 	int rv;
@@ -667,7 +667,7 @@ p2k_fs_fhtonode(struct puffs_usermount *
 
 	puffs_newinfo_setcookie(pni, p2n);
 	rump_pub_getvninfo(vp, &vtype, &vsize, (void *)&rdev);
-	puffs_newinfo_setvtype(pni, vtype);
+	puffs_newinfo_setvtype(pni, (enum vtype)vtype);
 	puffs_newinfo_setsize(pni, vsize);
 	/* LINTED: yea, it'll lose accuracy, but that's life */
 	puffs_newinfo_setrdev(pni, rdev);
@@ -714,7 +714,7 @@ p2k_node_lookup(struct puffs_usermount *
 	struct p2k_node *p2n_dir = opc, *p2n;
 	struct componentname *cn;
 	struct vnode *dvp = p2n_dir->p2n_vp, *vp;
-	enum vtype vtype;
+	enum rump_vtype vtype;
 	voff_t vsize;
 	uint64_t rdev; /* XXX: uint64_t because of stack overwrite in compat */
 	int rv;
@@ -726,7 +726,7 @@ p2k_node_lookup(struct puffs_usermount *
 	freecn(cn);
 
 	if (rv) {
-		if (rv == EJUSTRETURN) {
+		if (rv == RUMP_EJUSTRETURN) {
 			rv = ENOENT;
 		}
 		return rv;
@@ -740,7 +740,7 @@ p2k_node_lookup(struct puffs_usermount *
 
 	puffs_newinfo_setcookie(pni, p2n);
 	rump_pub_getvninfo(vp, &vtype, &vsize, (void *)&rdev);
-	puffs_newinfo_setvtype(pni, vtype);
+	puffs_newinfo_setvtype(pni, (enum vtype)vtype);
 	puffs_newinfo_setsize(pni, vsize);
 	/* LINTED: yea, it'll lose accuracy, but that's life */
 	puffs_newinfo_setrdev(pni, rdev);