Split MBR and PC98 on-disk sliceformats out from disklabel.h, step 1:
Peter had repocopied sys/disklabel.h to sys/diskpc98.h and sys/diskmbr.h. These two new copies are still intact copies of disklabel.h and therefore protected by #ifndef _SYS_DISKLABEL_H_ so #including them in programs which already include <sys.disklabel.h> is currently a no-op. This commit adds a number of such #includes. Once I have verified that I have fixed all the places which need fixing, I will commit the updated versions of the three #include files. Sponsored by: DARPA & NAI Labs.
This commit is contained in:
parent
eade9db908
commit
3bb24c35f2
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=104272
@ -20,6 +20,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/param.h>
|
||||
#include <sys/disklabel.h>
|
||||
#include <sys/diskslice.h>
|
||||
#include <sys/diskmbr.h>
|
||||
#include <sys/mount.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/sysctl.h>
|
||||
|
@ -22,6 +22,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/disklabel.h>
|
||||
#include <sys/diskslice.h>
|
||||
#include <sys/diskmbr.h>
|
||||
#include <paths.h>
|
||||
#include "libdisk.h"
|
||||
|
||||
|
@ -17,6 +17,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/types.h>
|
||||
#include <sys/diskslice.h>
|
||||
#include <sys/disklabel.h>
|
||||
#include <sys/diskmbr.h>
|
||||
#include "libdisk.h"
|
||||
|
||||
int
|
||||
|
@ -20,6 +20,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/disklabel.h>
|
||||
#include <sys/diskslice.h>
|
||||
#include <sys/diskmbr.h>
|
||||
#include <paths.h>
|
||||
#include "libdisk.h"
|
||||
|
||||
|
@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
|
||||
#define DKTYPENAMES
|
||||
#define FSTYPENAMES
|
||||
#include <sys/disklabel.h>
|
||||
#include <sys/diskmbr.h>
|
||||
#ifdef __sparc64__
|
||||
#include <sys/sun_disklabel.h>
|
||||
#endif
|
||||
|
@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
|
||||
#define DKTYPENAMES
|
||||
#define FSTYPENAMES
|
||||
#include <sys/disklabel.h>
|
||||
#include <sys/diskmbr.h>
|
||||
#ifdef __sparc64__
|
||||
#include <sys/sun_disklabel.h>
|
||||
#endif
|
||||
|
@ -31,6 +31,7 @@ static const char rcsid[] =
|
||||
|
||||
#include <sys/disk.h>
|
||||
#include <sys/disklabel.h>
|
||||
#include <sys/diskmbr.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/mount.h>
|
||||
|
@ -21,6 +21,7 @@
|
||||
#include <sys/reboot.h>
|
||||
#include <sys/diskslice.h>
|
||||
#include <sys/disklabel.h>
|
||||
#include <sys/diskmbr.h>
|
||||
#include <sys/dirent.h>
|
||||
#include <machine/bootinfo.h>
|
||||
#include <machine/elf.h>
|
||||
|
@ -21,6 +21,7 @@
|
||||
#include <sys/reboot.h>
|
||||
#include <sys/diskslice.h>
|
||||
#include <sys/disklabel.h>
|
||||
#include <sys/diskmbr.h>
|
||||
#include <sys/dirent.h>
|
||||
#include <machine/bootinfo.h>
|
||||
#include <machine/elf.h>
|
||||
|
@ -40,6 +40,7 @@
|
||||
|
||||
#include <sys/disklabel.h>
|
||||
#include <sys/diskslice.h>
|
||||
#include <sys/diskmbr.h>
|
||||
#include <sys/reboot.h>
|
||||
|
||||
#include <stdarg.h>
|
||||
|
@ -49,6 +49,7 @@
|
||||
#endif
|
||||
#include <sys/disk.h>
|
||||
#include <sys/disklabel.h>
|
||||
#include <sys/diskmbr.h>
|
||||
#define DOSPTYP_EXTENDED 5
|
||||
#define DOSPTYP_EXTENDEDX 15
|
||||
#define DOSPTYP_ONTRACK 84
|
||||
|
@ -53,6 +53,11 @@
|
||||
#include <sys/disk.h>
|
||||
#include <sys/disklabel.h>
|
||||
#include <sys/diskslice.h>
|
||||
#if defined(PC98) && !defined(PC98_ATCOMPAT)
|
||||
#include <sys/diskpc98.h>
|
||||
#else
|
||||
#include <sys/diskmbr.h>
|
||||
#endif
|
||||
#include <sys/fcntl.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/stat.h>
|
||||
|
@ -56,6 +56,11 @@
|
||||
#define DOSPTYP_EXTENDEDX 15
|
||||
#define DOSPTYP_ONTRACK 84
|
||||
#endif
|
||||
#if defined(PC98) && !defined(PC98_ATCOMPAT)
|
||||
#include <sys/diskpc98.h>
|
||||
#else
|
||||
#include <sys/diskmbr.h>
|
||||
#endif
|
||||
#include <sys/diskslice.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/syslog.h>
|
||||
|
@ -31,6 +31,7 @@ static const char rcsid[] =
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/disklabel.h>
|
||||
#include <sys/diskmbr.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#include <err.h>
|
||||
|
Loading…
Reference in New Issue
Block a user