Unbreak buildworld a slightly different way. Adjust null.h to not
authorMatthew Dillon <dillon@dragonflybsd.org>
Thu, 18 Sep 2008 16:08:32 +0000 (16:08 +0000)
committerMatthew Dillon <dillon@dragonflybsd.org>
Thu, 18 Sep 2008 16:08:32 +0000 (16:08 +0000)
include internal structures when being included from userland.

sbin/mount_null/mount_null.c
sys/vfs/nullfs/null.h

index 6ce02b8..ec23bd9 100644 (file)
  * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)mount_null.c    8.6 (Berkeley) 4/26/95
  * $FreeBSD: src/sbin/mount_null/mount_null.c,v 1.13 1999/10/09 11:54:11 phk Exp $
- * $DragonFly: src/sbin/mount_null/mount_null.c,v 1.10 2008/09/18 11:54:25 swildner Exp $
+ * $DragonFly: src/sbin/mount_null/mount_null.c,v 1.11 2008/09/18 16:08:31 dillon Exp $
  */
 
-#define _KERNEL_STRUCTURES
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <vfs/nullfs/null.h>
index 78db32e..c227244 100644 (file)
  *     @(#)null.h      8.3 (Berkeley) 8/20/94
  *
  * $FreeBSD: src/sys/miscfs/nullfs/null.h,v 1.11.2.3 2001/06/26 04:20:09 bp Exp $
- * $DragonFly: src/sys/vfs/nullfs/null.h,v 1.9 2008/09/17 21:44:25 dillon Exp $
+ * $DragonFly: src/sys/vfs/nullfs/null.h,v 1.10 2008/09/18 16:08:32 dillon Exp $
  */
 
 struct null_args {
        char            *target;        /* Target of loopback  */
 };
 
+#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
+
 struct null_mount {
        struct mount    *nullm_vfs;
        struct vnode    *nullm_rootvp;  /* Reference to root null_node */
        struct netexport export;
 };
 
+#endif
+
 #ifdef _KERNEL
 #define        MOUNTTONULLMOUNT(mp) ((struct null_mount *)((mp)->mnt_data))