From b35e69503a46790139712a96887b9f941e8c95dc Mon Sep 17 00:00:00 2001
From: Bosko Milekic <bmilekic@FreeBSD.org>
Date: Fri, 16 Aug 2002 16:08:36 +0000
Subject: [PATCH] Fix more breakage due to FSTYPENAMES/DKTYPENAMES split.

Also submitted by: David Wolfskill <david@catwhisker.org>
---
 sbin/bsdlabel/bsdlabel.c   | 1 +
 sbin/disklabel/disklabel.c | 1 +
 sbin/fsck_ffs/setup.c      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index cbbdcf872102..f5c35d2e1a50 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 #include <sys/wait.h>
 #define DKTYPENAMES
+#define FSTYPENAMES
 #include <sys/disklabel.h>
 #ifdef __sparc64__
 #include <sys/sun_disklabel.h>
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index cbbdcf872102..f5c35d2e1a50 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 #include <sys/wait.h>
 #define DKTYPENAMES
+#define FSTYPENAMES
 #include <sys/disklabel.h>
 #ifdef __sparc64__
 #include <sys/sun_disklabel.h>
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index 34636156a32f..16ba0271f364 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -41,6 +41,7 @@ static const char rcsid[] =
 
 #include <sys/param.h>
 #include <sys/stat.h>
+#define FSTYPENAMES
 #include <sys/disklabel.h>
 #include <sys/file.h>
 #include <sys/sysctl.h>