summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Ramesa <mpr@hi.t-com.hr>2013-11-30 11:16:02 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2013-12-08 23:07:21 +0900
commit3ff76bcbb9853054a91f6292da85d3dad47382fe (patch)
tree7b31174f146ba60aae27e65bac553a4538f6a0fc
parent5eb7693cd909511308b6c2828686d51375a3506a (diff)
Add ifndefs
* i386/i386at/cram.h [_CRAM_H_]: Add ifndef. * i386/i386at/disk.h [_DISK_H_]: Likewise. * i386/i386at/i8250.h [_I8250_H_]: Likewise. * i386/include/mach/i386/asm.h [_MACH_I386_ASM_H_]: Likewise. * i386/include/mach/i386/disk.h [_MACH_I386_DISK_H_]: Likewise.
-rw-r--r--i386/i386at/cram.h4
-rw-r--r--i386/i386at/disk.h4
-rw-r--r--i386/i386at/i8250.h5
-rw-r--r--i386/include/mach/i386/asm.h4
-rw-r--r--i386/include/mach/i386/disk.h4
5 files changed, 21 insertions, 0 deletions
diff --git a/i386/i386at/cram.h b/i386/i386at/cram.h
index 8373ce0..40f3f0a 100644
--- a/i386/i386at/cram.h
+++ b/i386/i386at/cram.h
@@ -50,6 +50,9 @@ NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUR OF OR IN CONNECTION
WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#ifndef _CRAM_H_
+#define _CRAM_H_
+
/*
* outb(CMOS_ADDR, addr);
* result = inb(CMOS_DATA);
@@ -73,3 +76,4 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define CM_CGA_80 0x20
#define CM_MONO_80 0x30
+#endif /* _CRAM_H_ */
diff --git a/i386/i386at/disk.h b/i386/i386at/disk.h
index e1fe6b9..63d033f 100644
--- a/i386/i386at/disk.h
+++ b/i386/i386at/disk.h
@@ -49,6 +49,9 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* disk.h
*/
+#ifndef _DISK_H_
+#define _DISK_H_
+
/* Grab the public part. */
#include <mach/machine/disk.h>
@@ -184,3 +187,4 @@ struct mboot { /* master boot block */
u_short signature;
};
+#endif /* _DISK_H_ */
diff --git a/i386/i386at/i8250.h b/i386/i386at/i8250.h
index fa81173..9b8a801 100644
--- a/i386/i386at/i8250.h
+++ b/i386/i386at/i8250.h
@@ -49,6 +49,9 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* Header file for i8250 chip
*/
+#ifndef _I8250_H_
+#define _I8250_H_
+
/* port offsets from the base i/o address */
#define RDAT 0
@@ -127,3 +130,5 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define BCNT2400 0x30
#define BCNT4800 0x18
#define BCNT9600 0x0c
+
+#endif /* _I8250_H_ */
diff --git a/i386/include/mach/i386/asm.h b/i386/include/mach/i386/asm.h
index 3e3f48b..4e3b589 100644
--- a/i386/include/mach/i386/asm.h
+++ b/i386/include/mach/i386/asm.h
@@ -24,6 +24,8 @@
* the rights to redistribute these changes.
*/
+#ifndef _MACH_I386_ASM_H_
+#define _MACH_I386_ASM_H_
#define S_ARG0 4(%esp)
#define S_ARG1 8(%esp)
@@ -113,3 +115,5 @@
#define Entry(x) .globl EXT(x); .p2align TEXT_ALIGN; LEXT(x)
#define DATA(x) .globl EXT(x); .p2align DATA_ALIGN; LEXT(x)
+
+#endif /* _MACH_I386_ASM_H_ */
diff --git a/i386/include/mach/i386/disk.h b/i386/include/mach/i386/disk.h
index 40ed4fa..1bbbbdf 100644
--- a/i386/include/mach/i386/disk.h
+++ b/i386/include/mach/i386/disk.h
@@ -49,6 +49,9 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* disk.h
*/
+#ifndef _MACH_I386_DISK_H_
+#define _MACH_I386_DISK_H_
+
#if defined(__linux__) || defined(__masix__)
#define PART_DISK 4 /* partition number for entire disk */
#else
@@ -118,3 +121,4 @@ struct absio {
char *abs_buf; /* Sector buffer */
};
+#endif /* _MACH_I386_DISK_H_ */