Rewrite old-style #endif FOO directives

* i386/include/mach/i386/cthreads.h: Rewrite old-style #endif FOO
directives.
* include/device/tape_status.h: Likewise.
* include/mach/alert.h: Likewise.
* include/mach/boot.h: Likewise.
* include/mach/default_pager_types.defs: Likewise.
* include/mach/default_pager_types.h: Likewise.
* include/mach/multiboot.h: Likewise.
* include/mach/notify.defs: Likewise.
* include/mach_debug/pc_info.h: Likewise.
* kern/act.h: Likewise.
* kern/refcount.h: Likewise.
* kern/shuttle.h: Likewise.

12 files changed, 20 insertions, 20 deletions

diff --git a/i386/include/mach/i386/cthreads.h b/i386/include/mach/i386/cthreads.h
index f9755b4..d2aa16f 100644
--- a/i386/include/mach/i386/cthreads.h
+++ b/i386/include/mach/i386/cthreads.h
@@ -53,4 +53,4 @@ typedef volatile int spin_lock_t;
 
 #endif	/* __GNUC__ */
 
-#endif _MACHINE_CTHREADS_H_
+#endif	/* _MACHINE_CTHREADS_H_ */
diff --git a/include/device/tape_status.h b/include/device/tape_status.h
index 97cb098..603d76c 100644
--- a/include/device/tape_status.h
+++ b/include/device/tape_status.h
@@ -137,4 +137,4 @@ struct mtget {
 #define MTIOCEEOT	_IO('m', 4)			/* enable EOT error */
 
 
-#endif	_TAPE_STATUS_H_
+#endif	/* _TAPE_STATUS_H_ */
diff --git a/include/mach/alert.h b/include/mach/alert.h
index 8232f9e..e8eb371 100644
--- a/include/mach/alert.h
+++ b/include/mach/alert.h
@@ -34,4 +34,4 @@
 
 #define ALERT_USER		0xffff0000	/* User-defined alert bits */
 
-#endif	_MACH_ALERT_H_
+#endif	/* _MACH_ALERT_H_ */
diff --git a/include/mach/boot.h b/include/mach/boot.h
index d3e141f..7f14cc4 100644
--- a/include/mach/boot.h
+++ b/include/mach/boot.h
@@ -65,7 +65,7 @@ struct boot_rendezvous
 	int code;
 };
 
-#endif !__ASSEMBLER__
+#endif	/* !__ASSEMBLER__ */
 
 
 /* This is the magic value that must appear in boot_module.magic.  */
@@ -90,4 +90,4 @@ struct boot_rendezvous
 #define BRZV_DATA	'D'
 
 
-#endif _MACH_BOOT_
+#endif	/* _MACH_BOOT_ */
diff --git a/include/mach/default_pager_types.defs b/include/mach/default_pager_types.defs
index 3164f04..bee7c25 100644
--- a/include/mach/default_pager_types.defs
+++ b/include/mach/default_pager_types.defs
@@ -41,4 +41,4 @@ type default_pager_filename_t = (MACH_MSG_TYPE_STRING_C, 8*256);
 
 import <mach/default_pager_types.h>;
 
-#endif	_MACH_DEFAULT_PAGER_TYPES_DEFS_
+#endif	/* _MACH_DEFAULT_PAGER_TYPES_DEFS_ */
diff --git a/include/mach/default_pager_types.h b/include/mach/default_pager_types.h
index 99e43ce..f5ce5a4 100644
--- a/include/mach/default_pager_types.h
+++ b/include/mach/default_pager_types.h
@@ -55,4 +55,4 @@ typedef default_pager_page_t *default_pager_page_array_t;
 
 typedef char default_pager_filename_t[256];
 
-#endif	_MACH_DEFAULT_PAGER_TYPES_H_
+#endif	/* _MACH_DEFAULT_PAGER_TYPES_H_ */
diff --git a/include/mach/multiboot.h b/include/mach/multiboot.h
index 3880fa8..b23df4a 100644
--- a/include/mach/multiboot.h
+++ b/include/mach/multiboot.h
@@ -79,4 +79,4 @@ struct multiboot_info
 	natural_t		pad[4];
 };
 
-#endif _MACH_MULTIBOOT_H_
+#endif	/* _MACH_MULTIBOOT_H_ */
diff --git a/include/mach/notify.defs b/include/mach/notify.defs
index fdf35e9..5e59d39 100644
--- a/include/mach/notify.defs
+++ b/include/mach/notify.defs
@@ -35,10 +35,10 @@ NOTIFY_IMPORTS
 #if	SEQNOS
 serverprefix do_seqnos_;
 serverdemux seqnos_notify_server;
-#else	SEQNOS
+#else
 serverprefix do_;
 serverdemux notify_server;
-#endif	SEQNOS
+#endif
 
 type notify_port_t = MACH_MSG_TYPE_MOVE_SEND_ONCE
 	ctype: mach_port_t
@@ -61,7 +61,7 @@ simpleroutine mach_notify_port_deleted(
 		notify	: notify_port_t;
 #if	SEQNOS
 	msgseqno seqno	: mach_port_seqno_t;
-#endif	SEQNOS
+#endif
 		name	: mach_port_name_t);
 
 /* MACH_NOTIFY_MSG_ACCEPTED: 0102 */
@@ -69,7 +69,7 @@ simpleroutine mach_notify_msg_accepted(
 		notify	: notify_port_t;
 #if	SEQNOS
 	msgseqno seqno	: mach_port_seqno_t;
-#endif	SEQNOS
+#endif
 		name	: mach_port_name_t);
 
 skip;	/* was NOTIFY_OWNERSHIP_RIGHTS: 0103 */
@@ -81,7 +81,7 @@ simpleroutine mach_notify_port_destroyed(
 		notify	: notify_port_t;
 #if	SEQNOS
 	msgseqno seqno	: mach_port_seqno_t;
-#endif	SEQNOS
+#endif
 		rights	: mach_port_receive_t);
 
 /* MACH_NOTIFY_NO_SENDERS: 0106 */
@@ -89,7 +89,7 @@ simpleroutine mach_notify_no_senders(
 		notify	: notify_port_t;
 #if	SEQNOS
 	msgseqno seqno	: mach_port_seqno_t;
-#endif	SEQNOS
+#endif
 		mscount	: mach_port_mscount_t);
 
 /* MACH_NOTIFY_SEND_ONCE: 0107 */
@@ -97,7 +97,7 @@ simpleroutine mach_notify_send_once(
 		notify	: notify_port_t
 #if	SEQNOS
 ;	msgseqno seqno	: mach_port_seqno_t
-#endif	SEQNOS
+#endif
 		);
 
 /* MACH_NOTIFY_DEAD_NAME: 0110 */
@@ -105,5 +105,5 @@ simpleroutine mach_notify_dead_name(
 		notify	: notify_port_t;
 #if	SEQNOS
 	msgseqno seqno	: mach_port_seqno_t;
-#endif	SEQNOS
+#endif
 		name	: mach_port_name_t);
diff --git a/include/mach_debug/pc_info.h b/include/mach_debug/pc_info.h
index bc43fa8..912da9f 100644
--- a/include/mach_debug/pc_info.h
+++ b/include/mach_debug/pc_info.h
@@ -40,4 +40,4 @@ typedef struct sampled_pc {
 typedef sampled_pc_t *sampled_pc_array_t;
 typedef unsigned int sampled_pc_seqno_t;
 
-#endif	_MACH_DEBUG_PC_INFO_H_
+#endif	/* _MACH_DEBUG_PC_INFO_H_ */
diff --git a/kern/act.h b/kern/act.h
index 6d3a9a9..f46f53a 100644
--- a/kern/act.h
+++ b/kern/act.h
@@ -189,4 +189,4 @@ kern_return_t	act_machine_get_state(Act *inc, int flavor, int *tstate, unsigned
 
 
 #endif /* MIGRATING_THREADS */
-#endif _KERN_ACT_H_
+#endif	/* _KERN_ACT_H_ */
diff --git a/kern/refcount.h b/kern/refcount.h
index 01dc6b5..74204d6 100644
--- a/kern/refcount.h
+++ b/kern/refcount.h
@@ -65,4 +65,4 @@ typedef struct RefCount RefCount;
 
 #endif /* MACHINE_REFCOUNT */
 
-#endif _KERN_REFCOUNT_H_
+#endif	/* _KERN_REFCOUNT_H_ */
diff --git a/kern/shuttle.h b/kern/shuttle.h
index e8e574b..0b1c2c5 100644
--- a/kern/shuttle.h
+++ b/kern/shuttle.h
@@ -68,4 +68,4 @@ typedef struct Shuttle Shuttle;
 
 
 
-#endif	_KERN_SHUTTLE_H_
+#endif	/* _KERN_SHUTTLE_H_ */