summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbmilekic <bmilekic@FreeBSD.org>2002-08-16 16:08:36 +0000
committerbmilekic <bmilekic@FreeBSD.org>2002-08-16 16:08:36 +0000
commitdf335c7ca33ab5e9b7a5e03aeb76501a21ccd60e (patch)
tree752a15ad8129ace5db47b2b6584e51ae6939f302
parent79f77ec38ab8bf2999fe858e78f41e233af286a8 (diff)
downloadFreeBSD-src-df335c7ca33ab5e9b7a5e03aeb76501a21ccd60e.zip
FreeBSD-src-df335c7ca33ab5e9b7a5e03aeb76501a21ccd60e.tar.gz
Fix more breakage due to FSTYPENAMES/DKTYPENAMES split.
Also submitted by: David Wolfskill <david@catwhisker.org>
-rw-r--r--sbin/bsdlabel/bsdlabel.c1
-rw-r--r--sbin/disklabel/disklabel.c1
-rw-r--r--sbin/fsck_ffs/setup.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index cbbdcf8..f5c35d2 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 cbbdcf8..f5c35d2 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 3463615..16ba027 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>
OpenPOWER on IntegriCloud