summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>1997-08-29 17:32:34 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>1997-08-29 17:32:34 +0000
commitd2b9d2acddd536dcfef89eda98626c04a528b4e6 (patch)
tree1bb200bcf93ab67f82f99c26865dd68fe54b5d03 /sys
parentf3ad2afa9ae18327e070552e59deecafd5adb494 (diff)
s/XXX/__MBR_XXX/ and undef it after use
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/include/disklabel.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/i386/include/disklabel.h b/sys/arch/i386/include/disklabel.h
index c265e9dfe05..11c87331331 100644
--- a/sys/arch/i386/include/disklabel.h
+++ b/sys/arch/i386/include/disklabel.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.h,v 1.12 1997/08/29 17:29:40 mickey Exp $ */
+/* $OpenBSD: disklabel.h,v 1.13 1997/08/29 17:32:33 mickey Exp $ */
/* $NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp $ */
/*
@@ -70,13 +70,13 @@ struct dos_partition {
#define DOSPTYP_NETBSD DOSPTYP_386BSD /* NetBSD partition type (XXX) */
#define DOSPTYP_OPENBSD 0xa6 /* OpenBSD partition type */
-#define XXX __attribute__((packed))
+#define __MBR_XXX __attribute__((packed))
struct dos_mbr {
- u_int8_t dmbr_boot[DOSPARTOFF] XXX;
- struct dos_partition dmbr_parts[NDOSPART] XXX;
- u_int16_t dmbr_sign XXX;
+ u_int8_t dmbr_boot[DOSPARTOFF] __MBR_XXX;
+ struct dos_partition dmbr_parts[NDOSPART] __MBR_XXX;
+ u_int16_t dmbr_sign __MBR_XXX;
};
-#undef XXX
+#undef __MBR_XXX
#define DOSMBR_SIGNATURE (0xaa55)