put the canonical ifdef dance for multiple inclusion, also put all the

contents of this file inside #ifdef _KERNEL; there's nothing here that
userland should ever need/touch.

but then again, some userland programs define _KERNEL before they include
kernel header files *shrugh*...

survived a build, OK blambert@

1 files changed, 10 insertions, 24 deletions

diff --git a/sys/nfs/nfs_var.h b/sys/nfs/nfs_var.h
index 178c45ab577..f7d27ac2d9a 100644
--- a/sys/nfs/nfs_var.h
+++ b/sys/nfs/nfs_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_var.h,v 1.41 2008/06/13 22:11:32 blambert Exp $	*/
+/*	$OpenBSD: nfs_var.h,v 1.42 2008/06/14 00:23:26 thib Exp $	*/
 /*	$NetBSD: nfs_var.h,v 1.3 1996/02/18 11:53:54 fvdl Exp $	*/
 
 /*
@@ -31,34 +31,17 @@
  */
 
 /*
- * XXX needs <nfs/rpcv2.h> and <nfs/nfs.h> because of typedefs
+ * XXX needs <nfs/rpcv2.h> and <nfs/nfs.h> because of typedefs.
  */
+#ifndef _NFS_NFS_VAR_H_
+#define _NFS_NFS_VAR_H_
+
+#ifdef _KERNEL
 
-struct vnode;
-struct uio;
-struct ucred;
-struct proc;
-struct buf;
-struct nfs_diskless;
-struct sockaddr_in;
-struct nfs_dlmount;
-struct vnode;
-struct nfsd;
-struct mbuf;
-struct file;
-struct nfssvc_sock;
-struct nfsmount;
-struct socket;
-struct nfsreq;
-struct vattr;
-struct nameidata;
 struct nfsnode;
 struct sillyrename;
 struct componentname;
-struct nfsd_srvargs;
-struct nfsrv_descript;
-struct nfs_fattr;
-union nethostaddr;
+struct nfs_diskless;
 
 /* nfs_bio.c */
 int nfs_bioread(struct vnode *, struct uio *, int, struct ucred *);
@@ -296,3 +279,6 @@ int  nfs_kqfilter(void *);
 /* Internal NFS utility macros */
 #define	mb_offset(m)	(mtod((m), caddr_t) + (m)->m_len)
 #define	nfsm_padlen(s)	(nfsm_rndup(s) - (s))
+
+#endif /* _KERNEL */
+#endif /* _NFS_NFS_VAR_H_ */