From d38ea97d5692fd273af6f1bb45f6fcbd1cc78c45 Mon Sep 17 00:00:00 2001
From: gene <gene@cvs.openbsd.org>
Date: Sun, 30 Nov 1997 06:12:37 +0000
Subject: Canonify the _*_H_ namespace appropriately. Also, clean up comments
 and wrap with _KERNEL correctly.

---
 sys/arch/mac68k/include/adbsys.h    |  8 ++++----
 sys/arch/mac68k/include/bus.h       |  4 +++-
 sys/arch/mac68k/include/cdefs.h     |  8 ++++----
 sys/arch/mac68k/include/cpu.h       | 21 +++++++--------------
 sys/arch/mac68k/include/disklabel.h |  8 ++++----
 sys/arch/mac68k/include/exec.h      |  8 ++++----
 sys/arch/mac68k/include/float.h     |  8 ++++----
 sys/arch/mac68k/include/frame.h     |  8 ++++----
 sys/arch/mac68k/include/iteioctl.h  | 11 ++++-------
 sys/arch/mac68k/include/limits.h    |  8 ++++----
 sys/arch/mac68k/include/macinfo.h   | 10 +++++-----
 sys/arch/mac68k/include/param.h     |  8 ++++----
 sys/arch/mac68k/include/pcb.h       | 10 +++++-----
 sys/arch/mac68k/include/pmap.h      |  8 ++++----
 sys/arch/mac68k/include/profile.h   |  8 ++++----
 sys/arch/mac68k/include/pte.h       |  8 ++++----
 sys/arch/mac68k/include/reg.h       |  8 ++++----
 sys/arch/mac68k/include/scsi96reg.h |  8 ++++----
 sys/arch/mac68k/include/types.h     |  8 ++++----
 19 files changed, 80 insertions(+), 88 deletions(-)

diff --git a/sys/arch/mac68k/include/adbsys.h b/sys/arch/mac68k/include/adbsys.h
index c4992ad0050..675768d8184 100644
--- a/sys/arch/mac68k/include/adbsys.h
+++ b/sys/arch/mac68k/include/adbsys.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adbsys.h,v 1.5 1997/11/11 22:42:27 gene Exp $	*/
+/*	$OpenBSD: adbsys.h,v 1.6 1997/11/30 06:12:19 gene Exp $	*/
 /*	$NetBSD: adbsys.h,v 1.5 1996/05/05 14:34:07 briggs Exp $	*/
 
 /*-
@@ -34,8 +34,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MACHINE_ADBSYS_H_
-#define _MACHINE_ADBSYS_H_
+#ifndef _MAC68K_ADBSYS_H_
+#define _MAC68K_ADBSYS_H_
 
 #include <sys/time.h>
 #include <sys/ioctl.h>
@@ -126,4 +126,4 @@ typedef struct adb_listencmd_s {
 
 void	adb_init __P((void));
 
-#endif /* _MACHINE_ADBSYS_H_ */
+#endif /* _MAC68K_ADBSYS_H_ */
diff --git a/sys/arch/mac68k/include/bus.h b/sys/arch/mac68k/include/bus.h
index a643949b672..2b09b34286d 100644
--- a/sys/arch/mac68k/include/bus.h
+++ b/sys/arch/mac68k/include/bus.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bus.h,v 1.3 1997/04/07 03:23:37 briggs Exp $ */
+/*      $OpenBSD: bus.h,v 1.4 1997/11/30 06:12:20 gene Exp $ */
 /*	$NetBSD: bus.h,v 1.6 1997/02/24 05:55:14 scottr Exp $	*/
 
 /*
@@ -52,6 +52,7 @@ typedef u_long bus_size_t;
 typedef int	bus_space_tag_t;
 typedef u_long	bus_space_handle_t;
 
+#ifdef _KERNEL
 /* in machdep.c */
 int	bus_space_map __P((bus_space_tag_t, bus_addr_t, bus_size_t,
 				int, bus_space_handle_t *));
@@ -66,6 +67,7 @@ int	bus_space_alloc __P((bus_space_tag_t t, bus_addr_t rstart,
 	    bus_space_handle_t *bshp));
 void	bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
 	    bus_size_t size));
+#endif /* _KERNEL */
 
 /*
  *	u_intN_t bus_space_read_N __P((bus_space_tag_t tag,
diff --git a/sys/arch/mac68k/include/cdefs.h b/sys/arch/mac68k/include/cdefs.h
index 283e1916b8e..29baa64d01b 100644
--- a/sys/arch/mac68k/include/cdefs.h
+++ b/sys/arch/mac68k/include/cdefs.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: cdefs.h,v 1.3 1996/05/26 18:35:45 briggs Exp $	*/
+/*	$OpenBSD: cdefs.h,v 1.4 1997/11/30 06:12:23 gene Exp $	*/
 /*	$NetBSD: cdefs.h,v 1.2 1996/05/05 06:17:34 briggs Exp $	*/
 
-#ifndef _CDEFS_MACHINE_
-#define _CDEFS_MACHINE_
+#ifndef _MAC68K_CDEFS_H_
+#define _MAC68K_CDEFS_H_
 
 #include <m68k/cdefs.h>
 
-#endif /* _CDEFS_MACHINE_ */
+#endif /* _MAC68K_CDEFS_H_ */
diff --git a/sys/arch/mac68k/include/cpu.h b/sys/arch/mac68k/include/cpu.h
index 43546893109..9dfb8e7b094 100644
--- a/sys/arch/mac68k/include/cpu.h
+++ b/sys/arch/mac68k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.16 1997/03/30 21:53:23 briggs Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.17 1997/11/30 06:12:24 gene Exp $	*/
 /*	$NetBSD: cpu.h,v 1.45 1997/02/10 22:13:40 scottr Exp $	*/
 
 /*
@@ -41,8 +41,9 @@
 
 /*
  *	Copyright (c) 1992, 1993 BCDL Labs.  All rights reserved.
- *	Allen Briggs, Chris Caputo, Michael Finch, Brad Grantham, Lawrence Kesteloot
-
+ *	Allen Briggs, Chris Caputo, Michael Finch, Brad Grantham,
+ *	Lawrence Kesteloot
+ *
  *	Redistribution of this source code or any part thereof is permitted,
  *	 provided that the following conditions are met:
  *	1) Utilized source contains the copyright message above, this list
@@ -62,16 +63,8 @@
  *	@(#)cpu.h	7.7 (Berkeley) 6/27/91
  */
 
-/*
-   ALICE
-	BG -- Sat May 23 23:58:23 EDT 1992
-	Exported defines and stuff unique to mac68k.
-   A lot of this stuff is really specific to the m68k, not just the macs,
-   but there isn't time to do anything about that right now...
- */
-
-#ifndef _CPU_MACHINE_
-#define _CPU_MACHINE_
+#ifndef _MAC68K_CPU_H_
+#define _MAC68K_CPU_H_
 
 #include <machine/pcb.h>
 
@@ -214,4 +207,4 @@ void	physaccess __P((caddr_t, caddr_t, register int, register int));
 
 __END_DECLS
 
-#endif	/* _CPU_MACHINE_ */
+#endif	/* _MAC68K_CPU_H_ */
diff --git a/sys/arch/mac68k/include/disklabel.h b/sys/arch/mac68k/include/disklabel.h
index 4ba284e8c8a..d57ffdc6a70 100644
--- a/sys/arch/mac68k/include/disklabel.h
+++ b/sys/arch/mac68k/include/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.3 1996/05/26 18:35:47 briggs Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.4 1997/11/30 06:12:24 gene Exp $	*/
 /*	$NetBSD: disklabel.h,v 1.2 1996/05/05 06:17:38 briggs Exp $	*/
 
 /*
@@ -31,8 +31,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _DISKLABEL_MACHINE_
-#define _DISKLABEL_MACHINE_
+#ifndef _MAC68K_DISKLABEL_H_
+#define _MAC68K_DISKLABEL_H_
 
 #define	LABELSECTOR	0			/* sector containing label */
 #define	LABELOFFSET	64			/* offset of label in sector */
@@ -44,4 +44,4 @@ struct cpu_disklabel {
 	int	cd_dummy;			/* must have one element. */
 };
 
-#endif /* _DISKLABEL_MACHINE_ */
+#endif /* _MAC68K_DISKLABEL_H_ */
diff --git a/sys/arch/mac68k/include/exec.h b/sys/arch/mac68k/include/exec.h
index de2b2485753..ab28e74559c 100644
--- a/sys/arch/mac68k/include/exec.h
+++ b/sys/arch/mac68k/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.5 1996/12/23 02:42:30 deraadt Exp $	*/
+/*	$OpenBSD: exec.h,v 1.6 1997/11/30 06:12:25 gene Exp $	*/
 /*	$NetBSD: exec.h,v 1.8 1996/05/05 06:17:40 briggs Exp $	*/
 
 /*-
@@ -34,8 +34,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-#ifndef _EXEC_MACHINE_
-#define _EXEC_MACHINE_
+#ifndef _MAC68K_EXEC_H_
+#define _MAC68K_EXEC_H_
 
 #define __LDPGSZ	8192
 
@@ -67,4 +67,4 @@ struct relocation_info_mac68k {
 #define _KERN_DO_ELF
 #endif
 
-#endif /* _EXEC_MACHINE_ */
+#endif /* _MAC68K_EXEC_H_ */
diff --git a/sys/arch/mac68k/include/float.h b/sys/arch/mac68k/include/float.h
index 194d6963a1a..22c30d794fe 100644
--- a/sys/arch/mac68k/include/float.h
+++ b/sys/arch/mac68k/include/float.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: float.h,v 1.3 1996/05/26 18:35:50 briggs Exp $	*/
+/*	$OpenBSD: float.h,v 1.4 1997/11/30 06:12:26 gene Exp $	*/
 /*	$NetBSD: float.h,v 1.6 1996/05/05 06:17:44 briggs Exp $	*/
 
-#ifndef _FLOAT_MACHINE_
-#define _FLOAT_MACHINE_
+#ifndef _MAC68K_FLOAT_H_
+#define _MAC68K_FLOAT_H_
 
 #include <m68k/float.h>
 
-#endif /* _FLOAT_MACHINE */
+#endif /* _MAC68K_FLOAT_H_ */
diff --git a/sys/arch/mac68k/include/frame.h b/sys/arch/mac68k/include/frame.h
index 4ef3f98a596..c6776983dc2 100644
--- a/sys/arch/mac68k/include/frame.h
+++ b/sys/arch/mac68k/include/frame.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: frame.h,v 1.3 1996/05/26 18:35:51 briggs Exp $	*/
+/*	$OpenBSD: frame.h,v 1.4 1997/11/30 06:12:27 gene Exp $	*/
 /*	$NetBSD: frame.h,v 1.5 1996/05/05 06:17:46 briggs Exp $	*/
 
-#ifndef _FRAME_MACHINE_
-#define _FRAME_MACHINE_
+#ifndef _MAC68K_FRAME_H_
+#define _MAC68K_FRAME_H_
 
 #include <m68k/frame.h>
 
-#endif /* _FRAME_MACHINE_ */
+#endif /* _MAC68K_FRAME_H_ */
diff --git a/sys/arch/mac68k/include/iteioctl.h b/sys/arch/mac68k/include/iteioctl.h
index 493390adefa..a9f974ef5b4 100644
--- a/sys/arch/mac68k/include/iteioctl.h
+++ b/sys/arch/mac68k/include/iteioctl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iteioctl.h,v 1.4 1997/11/11 22:46:26 gene Exp $	*/
+/*	$OpenBSD: iteioctl.h,v 1.5 1997/11/30 06:12:28 gene Exp $	*/
 /*	$NetBSD: iteioctl.h,v 1.1 1994/12/03 23:34:31 briggs Exp $	*/
 
 /*-
@@ -32,13 +32,10 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id: iteioctl.h,v 1.4 1997/11/11 22:46:26 gene Exp $
- *
  */
 
-#ifndef _MACHINE_ITEIOCTL_H_
-#define _MACHINE_ITEIOCTL_H_
+#ifndef _MAC68K_ITEIOCTL_H_
+#define _MAC68K_ITEIOCTL_H_
 
 #include <sys/ioctl.h>
 
@@ -53,4 +50,4 @@ struct bellparams {
 #define ITEIOC_SETBELL            _IOW('I', 129, struct bellparams)
 #define ITEIOC_RINGBELL            _IO('I', 130)
 
-#endif	/* _MACHINE_ITEIOCTL_H_ */
+#endif	/* _MACH68K_ITEIOCTL_H_ */
diff --git a/sys/arch/mac68k/include/limits.h b/sys/arch/mac68k/include/limits.h
index a679799208a..1d8171e47cf 100644
--- a/sys/arch/mac68k/include/limits.h
+++ b/sys/arch/mac68k/include/limits.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: limits.h,v 1.3 1997/07/24 14:48:49 deraadt Exp $	*/
+/*	$OpenBSD: limits.h,v 1.4 1997/11/30 06:12:29 gene Exp $	*/
 /*	$NetBSD: limits.h,v 1.6 1994/10/26 08:46:34 cgd Exp $	*/
 
-#ifndef _MACHINE_LIMITS_H_
-#define _MACHINE_LIMITS_H_
+#ifndef _MAC68K_LIMITS_H_
+#define _MAC68K_LIMITS_H_
 
 #include <m68k/limits.h>
 
-#endif /* _MACHINE_LIMITS_H_ */
+#endif /* _MAC68K_LIMITS_H_ */
diff --git a/sys/arch/mac68k/include/macinfo.h b/sys/arch/mac68k/include/macinfo.h
index 7fd03ac8f0f..f6b3355df85 100644
--- a/sys/arch/mac68k/include/macinfo.h
+++ b/sys/arch/mac68k/include/macinfo.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macinfo.h,v 1.2 1996/10/28 15:00:49 briggs Exp $	*/
+/*	$OpenBSD: macinfo.h,v 1.3 1997/11/30 06:12:30 gene Exp $	*/
 /*	$NetBSD: scsi96reg.h,v 1.5 1996/05/05 06:18:02 briggs Exp $	*/
 
 /*
@@ -28,8 +28,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MACINFO_MACHINE_
-#define _MACINFO_MACHINE_
+#ifndef _MAC68K_MACINFO_H_
+#define _MAC68K_MACINFO_H_
 
 /* values for machineid --
  * 	These are equivalent to the MacOS Gestalt values. */
@@ -138,7 +138,7 @@ struct mac68k_machine_S {
 	int			sccClkConst;	/* "Constant" for SCC bps */
 };
 
-	/* What kind of model is this */
+/* What kind of model is this */
 struct cpu_model_info {
 	int	machineid;	/* MacOS Gestalt value. */
 	char	*model_major;	/* Make this distinction to save a few */
@@ -156,4 +156,4 @@ extern  struct mac68k_machine_S	mac68k_machine;
 extern	unsigned long		load_addr;
 #endif /* _KERNEL */
 
-#endif
+#endif /* _MAC68K_MACINFO_H_ */
diff --git a/sys/arch/mac68k/include/param.h b/sys/arch/mac68k/include/param.h
index 06b9d6b78c0..cf9193f7f59 100644
--- a/sys/arch/mac68k/include/param.h
+++ b/sys/arch/mac68k/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.6 1997/03/08 16:17:00 briggs Exp $	*/
+/*	$OpenBSD: param.h,v 1.7 1997/11/30 06:12:31 gene Exp $	*/
 /*	$NetBSD: param.h,v 1.28 1997/03/01 06:57:45 scottr Exp $	*/
 
 /*
@@ -77,8 +77,8 @@
  *	@(#)param.h	7.8 (Berkeley) 6/28/91
  */
 
-#ifndef _PARAM_MACHINE_
-#define _PARAM_MACHINE_
+#ifndef _MAC68K_PARAM_H_
+#define _MAC68K_PARAM_H_
 
 #ifndef PSL_IPL
 #include <machine/psl.h>
@@ -198,4 +198,4 @@ void	delay		__P((unsigned));
 #define DELAY(ms)	delay(ms)
 #endif	/* _KERNEL && !_LOCORE */
 
-#endif /* _PARAM_MACHINE_ */
+#endif /* _MAC68K_PARAM_H_ */
diff --git a/sys/arch/mac68k/include/pcb.h b/sys/arch/mac68k/include/pcb.h
index b787e4a80e8..c726427522e 100644
--- a/sys/arch/mac68k/include/pcb.h
+++ b/sys/arch/mac68k/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcb.h,v 1.3 1996/05/26 18:35:56 briggs Exp $	*/
+/*	$OpenBSD: pcb.h,v 1.4 1997/11/30 06:12:32 gene Exp $	*/
 /*	$NetBSD: pcb.h,v 1.7 1996/05/05 06:17:51 briggs Exp $	*/
 
 /*
@@ -76,13 +76,13 @@
  *
  *	@(#)pcb.h	7.4 (Berkeley) 5/4/91
  */
-#ifndef	_PCB_MACHINE_
-#define	_PCB_MACHINE_
+#ifndef	_MAC68K_PCB_H_
+#define	_MAC68K_PCB_H_
 
 #include <machine/frame.h>
 
 /*
- * MacII process control block
+ * mac68k process control block
  */
 struct pcb
 {
@@ -107,4 +107,4 @@ struct md_coredump {
 	int	md_exec[16];	/* Exec structure for HP-UX (sic) core dumps */
 };
 
-#endif
+#endif /* _MAC68K_PCB_H_ */
diff --git a/sys/arch/mac68k/include/pmap.h b/sys/arch/mac68k/include/pmap.h
index 65ce48fa6e3..e68b168e82a 100644
--- a/sys/arch/mac68k/include/pmap.h
+++ b/sys/arch/mac68k/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.5 1997/03/08 16:17:01 briggs Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.6 1997/11/30 06:12:32 gene Exp $	*/
 /*	$NetBSD: pmap.h,v 1.14 1997/02/02 18:19:55 scottr Exp $	*/
 
 /*
@@ -75,8 +75,8 @@
 /* 
  *	@(#)pmap.h	7.6 (Berkeley) 5/10/91
  */
-#ifndef	_PMAP_MACHINE_
-#define	_PMAP_MACHINE_
+#ifndef	_MAC68K_PMAP_H_
+#define	_MAC68K_PMAP_H_
 
 #include <machine/pcb.h>
 #include <machine/pte.h>
@@ -215,4 +215,4 @@ __END_DECLS
 
 #endif	/* _KERNEL */
 
-#endif	/* _PMAP_MACHINE_ */
+#endif	/* _MAC68K_PMAP_H_ */
diff --git a/sys/arch/mac68k/include/profile.h b/sys/arch/mac68k/include/profile.h
index 5dc933dce17..9ca89ff0903 100644
--- a/sys/arch/mac68k/include/profile.h
+++ b/sys/arch/mac68k/include/profile.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: profile.h,v 1.3 1996/05/26 18:35:59 briggs Exp $	*/
+/*	$OpenBSD: profile.h,v 1.4 1997/11/30 06:12:33 gene Exp $	*/
 /*	$NetBSD: profile.h,v 1.3 1996/05/05 06:17:55 briggs Exp $	*/
 
-#ifndef _PROFILE_MACHINE_
-#define _PROFILE_MACHINE_
+#ifndef _MAC68K_PROFILE_H_
+#define _MAC68K_PROFILE_H_
 
 #include <m68k/profile.h>
 
-#endif _PROFILE_MACHINE_
+#endif
diff --git a/sys/arch/mac68k/include/pte.h b/sys/arch/mac68k/include/pte.h
index 0c8c6104e35..937789dc5f2 100644
--- a/sys/arch/mac68k/include/pte.h
+++ b/sys/arch/mac68k/include/pte.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pte.h,v 1.3 1996/05/26 18:36:01 briggs Exp $	*/
+/*	$OpenBSD: pte.h,v 1.4 1997/11/30 06:12:34 gene Exp $	*/
 /*	$NetBSD: pte.h,v 1.9 1996/05/05 06:17:58 briggs Exp $	*/
 
 /*
@@ -77,8 +77,8 @@
  *	@(#)pte.h	7.3 (Berkeley) 5/8/91
  */
 
-#ifndef _PTE_MACHINE_
-#define _PTE_MACHINE_
+#ifndef _MAC68K_PTE_H_
+#define _MAC68K_PTE_H_
 
 /*
  * Mac hardware segment/page table entries
@@ -153,4 +153,4 @@ typedef int	pt_entry_t;	/* Mach page table entry */
 #define	kvtophys(va) \
 	((kvtopte(va)->pg_pfnum << PGSHIFT) | ((int)(va) & PGOFSET))
 
-#endif /* _PTE_MACHINE_ */
+#endif /* _MAC68K_PTE_H_ */
diff --git a/sys/arch/mac68k/include/reg.h b/sys/arch/mac68k/include/reg.h
index 4dcadc4fd9c..a8765eb7f05 100644
--- a/sys/arch/mac68k/include/reg.h
+++ b/sys/arch/mac68k/include/reg.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: reg.h,v 1.3 1996/05/26 18:36:02 briggs Exp $	*/
+/*	$OpenBSD: reg.h,v 1.4 1997/11/30 06:12:35 gene Exp $	*/
 /*	$NetBSD: reg.h,v 1.10 1996/05/05 06:18:00 briggs Exp $	*/
 
-#ifndef _REG_MACHINE_
-#define	_REG_MACHINE_
+#ifndef _MAC68K_REG_H_
+#define	_MAC68K_REG_H_
 
 #include <machine/frame.h>
 #include <m68k/reg.h>
@@ -12,4 +12,4 @@ __BEGIN_DECLS
 void	regdump __P((struct frame *, int));
 __END_DECLS
 
-#endif /* _REG_MACHINE_ */
+#endif	/* _MAC68K_REG_H_ */
diff --git a/sys/arch/mac68k/include/scsi96reg.h b/sys/arch/mac68k/include/scsi96reg.h
index 7ea41515a62..c05079daf49 100644
--- a/sys/arch/mac68k/include/scsi96reg.h
+++ b/sys/arch/mac68k/include/scsi96reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi96reg.h,v 1.4 1996/10/23 04:52:03 briggs Exp $	*/
+/*	$OpenBSD: scsi96reg.h,v 1.5 1997/11/30 06:12:35 gene Exp $	*/
 /*	$NetBSD: scsi96reg.h,v 1.5 1996/05/05 06:18:02 briggs Exp $	*/
 
 /*
@@ -28,8 +28,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _SCSI96REG_MACHINE_
-#define _SCSI96REG_MACHINE_
+#ifndef _MAC68K_SCSI96REG_H_
+#define _MAC68K_SCSI96REG_H_
 
 typedef volatile unsigned char	v_uchar;
 
@@ -172,4 +172,4 @@ struct ncr53c96regs {
 
 #define NCR96_DALREG	0xF	/* Data alignment register.	W   */
 
-#endif /* _SCSI96REG_MACHINE_ */
+#endif /* _MAC68K_SCSI96REG_H_ */
diff --git a/sys/arch/mac68k/include/types.h b/sys/arch/mac68k/include/types.h
index 21442c0b967..3d0650b3301 100644
--- a/sys/arch/mac68k/include/types.h
+++ b/sys/arch/mac68k/include/types.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: types.h,v 1.4 1997/01/24 01:35:41 briggs Exp $	*/
+/*	$OpenBSD: types.h,v 1.5 1997/11/30 06:12:36 gene Exp $	*/
 /*	$NetBSD: types.h,v 1.10 1996/12/17 07:00:12 scottr Exp $	*/
 
-#ifndef _TYPES_MACHINE_
-#define _TYPES_MACHINE_
+#ifndef _MAC68K_TYPES_H_
+#define _MAC68K_TYPES_H_
 
 #include <m68k/types.h>
 
-#endif /* _TYPES_MACHINE_ */
+#endif /* _MAC68K_TYPES_H_ */
-- 
cgit v1.2.3