From 3d06c6b3f562051877367e0ec5ad451160f034f5 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Mon, 14 Nov 1994 13:08:44 +0000
Subject: [PATCH] Declare `struct dkbad' with the correct scope so that
 everything including <sys/disklabel.h> doesn't have to include <sys/dkbad.h>
 to avoid compiler warnings.

---
 sys/sys/disklabel.h | 4 +++-
 sys/sys/diskmbr.h   | 4 +++-
 sys/sys/diskpc98.h  | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index f486a60645b7..859192e7e374 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.1 (Berkeley) 6/2/93
- * $Id: disklabel.h,v 1.6 1994/10/27 20:45:09 jkh Exp $
+ * $Id: disklabel.h,v 1.7 1994/10/31 06:31:14 phk Exp $
  */
 
 #ifndef _SYS_DISKLABEL_H_
@@ -378,6 +378,8 @@ extern struct dos_partition dos_partitions[NDOSPART];
 #endif /* LOCORE */
 
 #ifdef KERNEL
+struct dkbad;
+
 u_int	 dkcksum __P((struct disklabel *));
 int	writedisklabel __P((dev_t dev, void (*strat)(), struct disklabel *lp));
 char *	readdisklabel __P((dev_t dev, void (*strat)(), struct disklabel *lp, struct dos_partition *dp, struct dkbad *bdp));
diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h
index f486a60645b7..859192e7e374 100644
--- a/sys/sys/diskmbr.h
+++ b/sys/sys/diskmbr.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.1 (Berkeley) 6/2/93
- * $Id: disklabel.h,v 1.6 1994/10/27 20:45:09 jkh Exp $
+ * $Id: disklabel.h,v 1.7 1994/10/31 06:31:14 phk Exp $
  */
 
 #ifndef _SYS_DISKLABEL_H_
@@ -378,6 +378,8 @@ extern struct dos_partition dos_partitions[NDOSPART];
 #endif /* LOCORE */
 
 #ifdef KERNEL
+struct dkbad;
+
 u_int	 dkcksum __P((struct disklabel *));
 int	writedisklabel __P((dev_t dev, void (*strat)(), struct disklabel *lp));
 char *	readdisklabel __P((dev_t dev, void (*strat)(), struct disklabel *lp, struct dos_partition *dp, struct dkbad *bdp));
diff --git a/sys/sys/diskpc98.h b/sys/sys/diskpc98.h
index f486a60645b7..859192e7e374 100644
--- a/sys/sys/diskpc98.h
+++ b/sys/sys/diskpc98.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.1 (Berkeley) 6/2/93
- * $Id: disklabel.h,v 1.6 1994/10/27 20:45:09 jkh Exp $
+ * $Id: disklabel.h,v 1.7 1994/10/31 06:31:14 phk Exp $
  */
 
 #ifndef _SYS_DISKLABEL_H_
@@ -378,6 +378,8 @@ extern struct dos_partition dos_partitions[NDOSPART];
 #endif /* LOCORE */
 
 #ifdef KERNEL
+struct dkbad;
+
 u_int	 dkcksum __P((struct disklabel *));
 int	writedisklabel __P((dev_t dev, void (*strat)(), struct disklabel *lp));
 char *	readdisklabel __P((dev_t dev, void (*strat)(), struct disklabel *lp, struct dos_partition *dp, struct dkbad *bdp));