Move some macros in <msdosfs/denode.h> to outside the #ifdef _KERNEL

so that libkvm doesn't need to define that, thereby avoiding some warnings.

ok miod@

diff --git a/lib/libkvm/kvm_file2.c b/lib/libkvm/kvm_file2.c
index 2af3d77..c7dc886 100644 (file)
--- a/lib/libkvm/kvm_file2.c
+++ b/lib/libkvm/kvm_file2.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: kvm_file2.c,v 1.15 2010/06/29 16:39:23 guenther Exp $ */
+/*     $OpenBSD: kvm_file2.c,v 1.16 2010/07/17 19:27:07 guenther Exp $ */
 
 /*
  * Copyright (c) 2009 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -90,9 +90,7 @@
 #include <nnpfs/nnpfs_node.h>
 
 #include <msdosfs/bpb.h>
-#define _KERNEL
 #include <msdosfs/denode.h>
-#undef _KERNEL
 #include <msdosfs/msdosfsmount.h>
 
 #include <miscfs/specfs/specdev.h>

diff --git a/sys/msdosfs/denode.h b/sys/msdosfs/denode.h
index 66aaeb9..fde57a0 100644 (file)
--- a/sys/msdosfs/denode.h
+++ b/sys/msdosfs/denode.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: denode.h,v 1.22 2010/05/16 20:26:39 nicm Exp $        */
+/*     $OpenBSD: denode.h,v 1.23 2010/07/17 19:27:07 guenther Exp $    */
 /*     $NetBSD: denode.h,v 1.24 1997/10/17 11:23:39 ws Exp $   */
 
 /*-
@@ -222,8 +222,6 @@ struct denode {
 #define        de_forw         de_chain[0]
 #define        de_back         de_chain[1]
 
-#ifdef _KERNEL
-
 #define        VTODE(vp)       ((struct denode *)(vp)->v_data)
 #define        DETOV(de)       ((de)->de_vnode)
 
@@ -257,6 +255,8 @@ struct defid {
 #endif
 };
 
+
+#ifdef _KERNEL
 /*
  * Prototypes for MSDOSFS vnode operations
  */