Normalize sentinel. Use _MACHINE_*_H_ and _<ARCH>_*_H_ properly and consitently.

Discussed and okay drahn@. Okay deraadt@.

5 files changed, 19 insertions, 19 deletions

diff --git a/sys/arch/powerpc/include/atomic.h b/sys/arch/powerpc/include/atomic.h
index 21f8233844e..152d4d4a29d 100644
--- a/sys/arch/powerpc/include/atomic.h
+++ b/sys/arch/powerpc/include/atomic.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: atomic.h,v 1.3 2007/03/17 22:10:04 kettenis Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __POWERPC_ATOMIC_H__
-#define __POWERPC_ATOMIC_H__
+#ifndef _POWERPC_ATOMIC_H_
+#define _POWERPC_ATOMIC_H_
 
 #if defined(_KERNEL)
 
@@ -34,4 +34,4 @@ atomic_clearbits_int(__volatile unsigned int *uip, unsigned int v)
 }
 
 #endif /* defined(_KERNEL) */
-#endif /* __POWERPC_ATOMIC_H__ */
+#endif /* _POWERPC_ATOMIC_H_ */
diff --git a/sys/arch/powerpc/include/db_machdep.h b/sys/arch/powerpc/include/db_machdep.h
index 1f46b301975..984310981eb 100644
--- a/sys/arch/powerpc/include/db_machdep.h
+++ b/sys/arch/powerpc/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.23 2010/11/27 19:57:23 miod Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.24 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.13 1996/04/29 20:50:08 leo Exp $	*/
 
 /*
@@ -30,8 +30,8 @@
 /*
  * Machine-dependent defines for new kernel debugger.
  */
-#ifndef	_PPC_DB_MACHDEP_H_
-#define	_PPC_DB_MACHDEP_H_
+#ifndef	_POWERPC_DB_MACHDEP_H_
+#define	_POWERPC_DB_MACHDEP_H_
 
 #include <sys/types.h>
 #include <uvm/uvm_param.h>
@@ -110,4 +110,4 @@ extern struct mutex ddb_mp_mutex;
 
 #endif /* _KERNEL */
 
-#endif	/* _PPC_DB_MACHDEP_H_ */
+#endif	/* _POWERPC_DB_MACHDEP_H_ */
diff --git a/sys/arch/powerpc/include/endian.h b/sys/arch/powerpc/include/endian.h
index 5372139b261..5518c48b398 100644
--- a/sys/arch/powerpc/include/endian.h
+++ b/sys/arch/powerpc/include/endian.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: endian.h,v 1.15 2011/03/11 15:17:08 pirofti Exp $ */
+/*	$OpenBSD: endian.h,v 1.16 2011/03/23 16:54:36 pirofti Exp $ */
 
 /*-
  * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
@@ -24,8 +24,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MACHINE_ENDIAN_H_
-#define _MACHINE_ENDIAN_H_
+#ifndef _POWERPC_ENDIAN_H_
+#define _POWERPC_ENDIAN_H_
 
 #undef _BIG_ENDIAN	/* XXX - gcc may define _BIG_ENDIAN too */
 #define _BYTE_ORDER _BIG_ENDIAN
@@ -33,4 +33,4 @@
 
 #define	__STRICT_ALIGNMENT
 
-#endif /* _MACHINE_ENDIAN_H_ */
+#endif /* _POWERPC_ENDIAN_H_ */
diff --git a/sys/arch/powerpc/include/internal_types.h b/sys/arch/powerpc/include/internal_types.h
index d5b5111fe3b..75e5d9f9b8f 100644
--- a/sys/arch/powerpc/include/internal_types.h
+++ b/sys/arch/powerpc/include/internal_types.h
@@ -1,7 +1,7 @@
-/* $OpenBSD: internal_types.h,v 1.2 2003/06/24 14:43:12 drahn Exp $ */
+/* $OpenBSD: internal_types.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $ */
 /* Public domain */
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
+#ifndef _POWERPC_INTERNAL_TYPES_H_
+#define _POWERPC_INTERNAL_TYPES_H_
 
 #ifdef __CHAR_UNSIGNED__
 #define __machine_has_unsigned_chars
diff --git a/sys/arch/powerpc/include/reloc.h b/sys/arch/powerpc/include/reloc.h
index bf77daec8eb..6a881cb1616 100644
--- a/sys/arch/powerpc/include/reloc.h
+++ b/sys/arch/powerpc/include/reloc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reloc.h,v 1.3 2010/06/27 03:11:44 guenther Exp $	*/
+/*	$OpenBSD: reloc.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: reloc.h,v 1.1 1996/09/30 16:34:33 ws Exp $	*/
 
 /*-
@@ -31,8 +31,8 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef	_MACH_RELOC_H_
-#define	_MACH_RELOC_H_
+#ifndef	_POWERPC_RELOC_H_
+#define	_POWERPC_RELOC_H_
 
 /*
  * Quite a number of relocation types
@@ -88,4 +88,4 @@ enum reloc_type {
 	RELOC_MAX
 };
 
-#endif	/* _MACH_RELOC_H_ */
+#endif	/* _POWERPC_RELOC_H_ */