diff options
| author |   krw <krw@openbsd.org> | 2015-09-30 15:35:30 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2015-09-30 15:35:30 +0000 |
| commit | 70864f2a35d4a3aa60f79291d28ef37786c9dd98 (patch) | |
| tree | fa3f8d8cf43624a6cc31725a3d8870d955b41701 | |
| parent | Remove some trailing whitespace. (diff) | |
| download | wireguard-openbsd-70864f2a35d4a3aa60f79291d28ef37786c9dd98.tar.xz wireguard-openbsd-70864f2a35d4a3aa60f79291d28ef37786c9dd98.zip | |
Use #ifndef _MACHINE_DISKLABEL_H_ everywhere. Replace _ARM_DISKLABEL_H_
and _SH_DISKLABEL_H_ with _MACHINE_DISKLABEL_H_. Add the guard to
loongson and octeon. The #defines are not used anywhere else in the
tree so no functional change.
| -rw-r--r-- | sys/arch/arm/include/disklabel.h | 8 | ||||
| -rw-r--r-- | sys/arch/loongson/include/disklabel.h | 7 | ||||
| -rw-r--r-- | sys/arch/octeon/include/disklabel.h | 7 | ||||
| -rw-r--r-- | sys/arch/sh/include/disklabel.h | 8 |
4 files changed, 20 insertions, 10 deletions
diff --git a/sys/arch/arm/include/disklabel.h b/sys/arch/arm/include/disklabel.h index 933906b4ab9..173e097d496 100644 --- a/sys/arch/arm/include/disklabel.h +++ b/sys/arch/arm/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.14 2015/09/30 14:57:03 krw Exp $ */ +/* $OpenBSD: disklabel.h,v 1.15 2015/09/30 15:35:30 krw Exp $ */ /* * Copyright (c) 1994 Mark Brinicombe. @@ -35,11 +35,11 @@ * SUCH DAMAGE. */ -#ifndef _ARM_DISKLABEL_H_ -#define _ARM_DISKLABEL_H_ +#ifndef _MACHINE_DISKLABEL_H_ +#define _MACHINE_DISKLABEL_H_ #define LABELSECTOR 1 /* sector containing label */ #define LABELOFFSET 0 /* offset of label in sector */ #define MAXPARTITIONS 16 /* number of partitions */ -#endif /* _ARM_DISKLABEL_H_ */ +#endif /* _MACHINE_DISKLABEL_H_ */ diff --git a/sys/arch/loongson/include/disklabel.h b/sys/arch/loongson/include/disklabel.h index 6fe42a8bf66..ff4de7b53ed 100644 --- a/sys/arch/loongson/include/disklabel.h +++ b/sys/arch/loongson/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.2 2015/09/30 14:57:03 krw Exp $ */ +/* $OpenBSD: disklabel.h,v 1.3 2015/09/30 15:35:30 krw Exp $ */ /* public domain */ /* @@ -6,6 +6,11 @@ * of the OpenBSD partition. */ +#ifndef _MACHINE_DISKLABEL_H_ +#define _MACHINE_DISKLABEL_H_ + #define LABELSECTOR 1 /* sector containing label */ #define LABELOFFSET 0 /* offset of label in sector */ #define MAXPARTITIONS 16 /* number of partitions */ + +#endif /* _MACHINE_DISKLABEL_H_ */ diff --git a/sys/arch/octeon/include/disklabel.h b/sys/arch/octeon/include/disklabel.h index 6fe42a8bf66..ff4de7b53ed 100644 --- a/sys/arch/octeon/include/disklabel.h +++ b/sys/arch/octeon/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.2 2015/09/30 14:57:03 krw Exp $ */ +/* $OpenBSD: disklabel.h,v 1.3 2015/09/30 15:35:30 krw Exp $ */ /* public domain */ /* @@ -6,6 +6,11 @@ * of the OpenBSD partition. */ +#ifndef _MACHINE_DISKLABEL_H_ +#define _MACHINE_DISKLABEL_H_ + #define LABELSECTOR 1 /* sector containing label */ #define LABELOFFSET 0 /* offset of label in sector */ #define MAXPARTITIONS 16 /* number of partitions */ + +#endif /* _MACHINE_DISKLABEL_H_ */ diff --git a/sys/arch/sh/include/disklabel.h b/sys/arch/sh/include/disklabel.h index b34fd62f80c..de93d3b529c 100644 --- a/sys/arch/sh/include/disklabel.h +++ b/sys/arch/sh/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.9 2015/09/30 14:57:03 krw Exp $ */ +/* $OpenBSD: disklabel.h,v 1.10 2015/09/30 15:35:30 krw Exp $ */ /* * Copyright (c) 1994 Mark Brinicombe. @@ -35,11 +35,11 @@ * SUCH DAMAGE. */ -#ifndef _SH_DISKLABEL_H_ -#define _SH_DISKLABEL_H_ +#ifndef _MACHINE_DISKLABEL_H_ +#define _MACHINE_DISKLABEL_H_ #define LABELSECTOR 1 /* sector containing label */ #define LABELOFFSET 0 /* offset of label in sector */ #define MAXPARTITIONS 16 /* number of partitions */ -#endif /* _SH_DISKLABEL_H_ */ +#endif /* _MACHINE_DISKLABEL_H_ */ |