2001-04-04 Roland McGrath <roland@frob.com>

	* ddb/db_access.h: Fix obsolescent #else/#endif syntax.
	* ddb/db_aout.c: Likewise.
	* ddb/db_break.c: Likewise.
	* ddb/db_break.h: Likewise.
	* ddb/db_command.c: Likewise.
	* ddb/db_command.h: Likewise.
	* ddb/db_cond.c: Likewise.
	* ddb/db_examine.c: Likewise.
	* ddb/db_expr.c: Likewise.
	* ddb/db_ext_symtab.c: Likewise.
	* ddb/db_input.c: Likewise.
	* ddb/db_lex.c: Likewise.
	* ddb/db_macro.c: Likewise.
	* ddb/db_mp.c: Likewise.
	* ddb/db_output.c: Likewise.
	* ddb/db_print.c: Likewise.
	* ddb/db_run.c: Likewise.
	* ddb/db_sym.c: Likewise.
	* ddb/db_task_thread.c: Likewise.
	* ddb/db_task_thread.h: Likewise.
	* ddb/db_trap.c: Likewise.
	* ddb/db_variables.c: Likewise.
	* ddb/db_watch.c: Likewise.
	* ddb/db_watch.h: Likewise.
	* ddb/db_write_cmd.c: Likewise.
	* device/dev_pager.c: Likewise.
	* device/device_port.h: Likewise.
	* device/device_types_kernel.h: Likewise.
	* device/ds_routines.h: Likewise.
	* device/errno.h: Likewise.
	* device/if_ether.h: Likewise.
	* device/if_hdr.h: Likewise.
	* device/io_req.h: Likewise.
	* device/net_io.c: Likewise.
	* device/net_io.h: Likewise.
	* i386/i386/ast_check.c: Likewise.
	* i386/i386/cswitch.S: Likewise.
	* i386/i386/db_disasm.c: Likewise.
	* i386/i386/db_interface.c: Likewise.
	* i386/i386/db_trace.c: Likewise.
	* i386/i386/debug.h: Likewise.
	* i386/i386/debug_i386.c: Likewise.
	* i386/i386/debug_trace.S: Likewise.
	* i386/i386/eflags.h: Likewise.
	* i386/i386/gdt.h: Likewise.
	* i386/i386/hardclock.c: Likewise.
	* i386/i386/idt-gen.h: Likewise.
	* i386/i386/ipl.h: Likewise.
	* i386/i386/ktss.h: Likewise.
	* i386/i386/kttd_interface.c: Likewise.
	* i386/i386/ldt.h: Likewise.
	* i386/i386/lock.h: Likewise.
	* i386/i386/locore.S: Likewise.
	* i386/i386/mp_desc.h: Likewise.
	* i386/i386/pic.c: Likewise.
	* i386/i386/pic.h: Likewise.
	* i386/i386/pio.h: Likewise.
	* i386/i386/pit.h: Likewise.
	* i386/i386/seg.h: Likewise.
	* i386/i386/thread.h: Likewise.
	* i386/i386/trap.c: Likewise.
	* i386/i386/trap.h: Likewise.
	* i386/i386/vm_param.h: Likewise.
	* i386/i386/vm_tuning.h: Likewise.
	* i386/i386at/autoconf.c: Likewise.
	* i386/i386at/blit.c: Likewise.
	* i386/i386at/conf.c: Likewise.
	* i386/i386at/fd.c: Likewise.
	* i386/i386at/idt.h: Likewise.
	* i386/i386at/immc.c: Likewise.
	* i386/i386at/kd.c: Likewise.
	* i386/i386at/kd_event.c: Likewise.
	* i386/i386at/kd_mouse.c: Likewise.
	* i386/i386at/model_dep.c: Likewise.
	* i386/i386at/rtc.c: Likewise.
	* i386/include/mach/i386/asm.h: Likewise.
	* i386/include/mach/i386/eflags.h: Likewise.
	* i386/include/mach/i386/mach_i386.defs: Likewise.
	* i386/include/mach/i386/multiboot.h: Likewise.
	* i386/include/mach/i386/trap.h: Likewise.
	* i386/include/mach/i386/vm_types.h: Likewise.
	* i386/include/mach/sa/stdarg.h: Likewise.
	* i386/intel/pmap.c: Likewise.
	* i386/intel/pmap.h: Likewise.
	* include/alloca.h: Likewise.
	* include/device/device_types.defs: Likewise.
	* include/device/device_types.h: Likewise.
	* include/device/disk_status.h: Likewise.
	* include/device/net_status.h: Likewise.
	* include/mach/mach.defs: Likewise.
	* include/mach/memory_object.defs: Likewise.
	* include/mach/std_types.defs: Likewise.
	* include/mach_debug/hash_info.h: Likewise.
	* include/mach_debug/ipc_info.h: Likewise.
	* include/mach_debug/mach_debug.defs: Likewise.
	* include/mach_debug/mach_debug_types.defs: Likewise.
	* include/mach_debug/mach_debug_types.h: Likewise.
	* include/mach_debug/vm_info.h: Likewise.
	* include/mach_debug/zone_info.h: Likewise.
	* include/sys/ioctl.h: Likewise.
	* include/sys/time.h: Likewise.
	* ipc/ipc_entry.h: Likewise.
	* ipc/ipc_hash.h: Likewise.
	* ipc/ipc_init.c: Likewise.
	* ipc/ipc_kmsg.c: Likewise.
	* ipc/ipc_kmsg.h: Likewise.
	* ipc/ipc_marequest.c: Likewise.
	* ipc/ipc_marequest.h: Likewise.
	* ipc/ipc_mqueue.c: Likewise.
	* ipc/ipc_mqueue.h: Likewise.
	* ipc/ipc_notify.c: Likewise.
	* ipc/ipc_notify.h: Likewise.
	* ipc/ipc_object.c: Likewise.
	* ipc/ipc_object.h: Likewise.
	* ipc/ipc_port.c: Likewise.
	* ipc/ipc_port.h: Likewise.
	* ipc/ipc_pset.c: Likewise.
	* ipc/ipc_pset.h: Likewise.
	* ipc/ipc_right.c: Likewise.
	* ipc/ipc_right.h: Likewise.
	* ipc/ipc_space.c: Likewise.
	* ipc/ipc_space.h: Likewise.
	* ipc/mach_debug.c: Likewise.
	* ipc/mach_msg.c: Likewise.
	* ipc/mach_msg.h: Likewise.
	* ipc/mach_port.c: Likewise.
	* kern/act.c: Likewise.
	* kern/assert.h: Likewise.
	* kern/ast.c: Likewise.
	* kern/ast.h: Likewise.
	* kern/bootstrap.c: Likewise.
	* kern/counters.c: Likewise.
	* kern/counters.h: Likewise.
	* kern/debug.h: Likewise.
	* kern/exception.c: Likewise.
	* kern/host.h: Likewise.
	* kern/ipc_host.c: Likewise.
	* kern/ipc_host.h: Likewise.
	* kern/ipc_kobject.c: Likewise.
	* kern/ipc_mig.c: Likewise.
	* kern/ipc_tt.c: Likewise.
	* kern/ipc_tt.h: Likewise.
	* kern/kalloc.h: Likewise.
	* kern/lock_mon.c: Likewise.
	* kern/mach_clock.c: Likewise.
	* kern/mach_factor.c: Likewise.
	* kern/mach_param.h: Likewise.
	* kern/machine.c: Likewise.
	* kern/processor.c: Likewise.
	* kern/profile.c: Likewise.
	* kern/queue.h: Likewise.
	* kern/sched.h: Likewise.
	* kern/startup.c: Likewise.
	* kern/syscall_emulation.h: Likewise.
	* kern/syscall_subr.c: Likewise.
	* kern/syscall_subr.h: Likewise.
	* kern/syscall_sw.c: Likewise.
	* kern/syscall_sw.h: Likewise.
	* kern/task.h: Likewise.
	* kern/thread_swap.h: Likewise.
	* kern/time_out.h: Likewise.
	* kern/time_stamp.c: Likewise.
	* kern/time_stamp.h: Likewise.
	* kern/timer.c: Likewise.
	* kern/timer.h: Likewise.
	* kern/xpr.c: Likewise.
	* kern/xpr.h: Likewise.
	* kern/zalloc.c: Likewise.
	* kern/zalloc.h: Likewise.
	* linux/dev/drivers/block/ide.c: Likewise.
	* linux/dev/include/linux/blk.h: Likewise.
	* linux/src/include/linux/cdrom.h: Likewise.
	* linux/src/include/linux/md.h: Likewise.
	* util/cpu.h: Likewise.
	* vm/memory_object.c: Likewise.
	* vm/memory_object.h: Likewise.
	* vm/pmap.h: Likewise.
	* vm/vm_debug.c: Likewise.
	* vm/vm_external.h: Likewise.
	* vm/vm_fault.c: Likewise.
	* vm/vm_fault.h: Likewise.
	* vm/vm_kern.h: Likewise.
	* vm/vm_map.c: Likewise.
	* vm/vm_map.h: Likewise.
	* vm/vm_object.h: Likewise.
	* vm/vm_pageout.c: Likewise.
	* vm/vm_pageout.h: Likewise.
	* vm/vm_user.h: Likewise.

17 files changed, 134 insertions, 134 deletions

diff --git a/include/alloca.h b/include/alloca.h
index 0a476b4f..29081cad 100644
--- a/include/alloca.h
+++ b/include/alloca.h
@@ -22,4 +22,4 @@
 
 #define alloca(size) __builtin_alloca(size)
 
-#endif _MACH_ALLOCA_H_
+#endif /* _MACH_ALLOCA_H_ */
diff --git a/include/device/device_types.defs b/include/device/device_types.defs
index c5d8e9d5..79e4c5b0 100644
--- a/include/device/device_types.defs
+++ b/include/device/device_types.defs
@@ -2,31 +2,31 @@
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
 /*
  *	Author: David B. Golub, Carnegie Mellon University
  *	Date: 	3/89
- *	
+ *
  *	Common definitions for device interface types.
  */
 
@@ -61,4 +61,4 @@ type device_t = mach_port_t
 import <device/device_types.h>;
 import <device/net_status.h>;
 
-#endif	_DEVICE_DEVICE_TYPES_DEFS_
+#endif	/* _DEVICE_DEVICE_TYPES_DEFS_ */
diff --git a/include/device/device_types.h b/include/device/device_types.h
index 08eec4a5..caf4fc04 100644
--- a/include/device/device_types.h
+++ b/include/device/device_types.h
@@ -1,25 +1,25 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -135,4 +135,4 @@ typedef	int		io_return_t;
 #define D_NO_MEMORY		2508	/* memory allocation failure */
 #define D_READ_ONLY		2509	/* device cannot be written to */
 
-#endif	DEVICE_TYPES_H
+#endif	/* DEVICE_TYPES_H */
diff --git a/include/device/disk_status.h b/include/device/disk_status.h
index 868e06ef..6db790a5 100644
--- a/include/device/disk_status.h
+++ b/include/device/disk_status.h
@@ -1,25 +1,25 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -66,7 +66,7 @@ struct disklabel {
 	short	d_type;			/* drive type */
 	short	d_subtype;		/* controller/d_type specific */
 	char	d_typename[16];		/* type name, e.g. "eagle" */
-	/* 
+	/*
 	 * d_packname contains the pack identifier and is returned when
 	 * the disklabel is read off the disk or in-core copy.
 	 * d_boot0 and d_boot1 are the (optional) names of the
@@ -75,15 +75,15 @@ struct disklabel {
 	 * getdiskbyname(3) to retrieve the values from /etc/disktab.
 	 */
 #if defined(MACH_KERNEL) || defined(STANDALONE)
-	char	d_packname[16];			/* pack identifier */ 
+	char	d_packname[16];			/* pack identifier */
 #else
 	union {
-		char	un_d_packname[16];	/* pack identifier */ 
+		char	un_d_packname[16];	/* pack identifier */
 		struct {
 			char *un_d_boot0;	/* primary bootstrap name */
 			char *un_d_boot1;	/* secondary bootstrap name */
-		} un_b; 
-	} d_un; 
+		} un_b;
+	} d_un;
 #define d_packname	d_un.un_d_packname
 #define d_boot0		d_un.un_b.un_d_boot0
 #define d_boot1		d_un.un_b.un_d_boot1
@@ -168,7 +168,7 @@ struct disklabel {
 	int	bugfix;
 #endif
 };
-#else LOCORE
+#else /* LOCORE */
 	/*
 	 * offsets for asm boot files.
 	 */
@@ -179,7 +179,7 @@ struct disklabel {
 	.set	d_secpercyl,56
 	.set	d_secperunit,60
 	.set	d_end_,276		/* size of disk label */
-#endif LOCORE
+#endif /* LOCORE */
 
 /* d_type values: */
 #define	DTYPE_SMD		1		/* SMD, XSMD; VAX hp/up */
@@ -301,6 +301,6 @@ struct format_op {
 
 #define DIOCSBAD	_IOW('d', 110, struct dkbad)	/* set kernel dkbad */
 
-#endif LOCORE
+#endif /* LOCORE */
 
 #endif	/* _DISK_STATUS_H_ */
diff --git a/include/device/net_status.h b/include/device/net_status.h
index 2b29b327..dbf5e39f 100644
--- a/include/device/net_status.h
+++ b/include/device/net_status.h
@@ -1,25 +1,25 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -83,7 +83,7 @@ struct net_status {
  *  We allow specification of up to NET_MAX_FILTER (short) words of a filter
  *  command list to be applied to incoming packets to determine if
  *  those packets should be given to a particular network input filter.
- *  
+ *
  *  Each network filter specifies the filter command list via net_add_filter.
  *  Each filter command list specifies a sequences of actions which leave a
  *  boolean value on the top of an internal stack.  Each word of the
@@ -94,10 +94,10 @@ struct net_status {
  *  top two elements of the stack and replaces them with its result.  The
  *  special action NOPUSH and the special operator NOP can be used to only
  *  perform the binary operation or to only push a value on the stack.
- *  
+ *
  *  If the final value of the filter operation is true, then the packet is
  *  accepted for the filter.
- *  
+ *
  */
 
 typedef	unsigned short	filter_t;
@@ -184,4 +184,4 @@ typedef struct net_rcv_msg 	*net_rcv_msg_t;
 
 
 
-#endif	_DEVICE_NET_STATUS_H_
+#endif	/* _DEVICE_NET_STATUS_H_ */
diff --git a/include/mach/mach.defs b/include/mach/mach.defs
index 1e4429d6..36d42776 100644
--- a/include/mach/mach.defs
+++ b/include/mach/mach.defs
@@ -164,13 +164,13 @@ skip;	/* old thread_mutate */
  */
 #ifdef	EMULATOR
 skip;	/* the emulator redefines vm_allocate using vm_map */
-#else	EMULATOR
+#else	/* EMULATOR */
 routine vm_allocate(
 		target_task	: vm_task_t;
 	inout	address		: vm_address_t;
 		size		: vm_size_t;
 		anywhere	: boolean_t);
-#endif	EMULATOR
+#endif	/* EMULATOR */
 
 skip;	/* old vm_allocate_with_pager */
 
@@ -582,21 +582,21 @@ routine	xxx_thread_info(
 routine task_set_emulation(
 		target_port	: task_t;
 		routine_entry_pt: vm_address_t;
-		routine_number  : int);	
+		routine_number  : int);
 
 /*
  *      Establish restart pc for interrupted atomic sequences.
  *	This reuses the message number for the old task_get_io_port.
  *	See task_info.h for description of flavors.
- *	
+ *
  */
 routine task_ras_control(
 		target_task     : task_t;
 		basepc          : vm_address_t;
 		boundspc        : vm_address_t;
 		flavor		: int);
-		
-		
+
+
 
 skip;	/* old host_ipc_statistics */
 
@@ -764,7 +764,7 @@ routine port_extract_receive(
 		his_name	: port_name_t;
 	out	his_port	: port_all_t);
 
-#else	MACH_IPC_COMPAT
+#else	/* MACH_IPC_COMPAT */
 
 skip;	/* old port_names */
 skip;	/* old port_type */
@@ -783,7 +783,7 @@ skip;	/* old port_extract_send */
 skip;	/* old port_insert_receive */
 skip;	/* old port_extract_receive */
 
-#endif	MACH_IPC_COMPAT
+#endif	/* MACH_IPC_COMPAT */
 
 /*
  *	Map a user-defined memory object into the virtual address
@@ -829,7 +829,7 @@ routine htg_vm_map(
 		cur_protection	: vm_prot_t;
 		max_protection	: vm_prot_t;
 		inheritance	: vm_inherit_t);
-#else	EMULATOR
+#else	/* EMULATOR */
 routine vm_map(
 		target_task	: vm_task_t;
 	inout	address		: vm_address_t;
@@ -842,7 +842,7 @@ routine vm_map(
 		cur_protection	: vm_prot_t;
 		max_protection	: vm_prot_t;
 		inheritance	: vm_inherit_t);
-#endif	EMULATOR
+#endif	/* EMULATOR */
 
 /*
  *	Indicate that a range of the specified memory object cannot
@@ -933,15 +933,15 @@ routine port_set_backup(
 				  ctype: mach_port_t;
 	out	previous	: port_t);
 
-#else	MACH_IPC_COMPAT
+#else	/* MACH_IPC_COMPAT */
 
 skip;	/* old port_set_backup */
 
-#endif	MACH_IPC_COMPAT
+#endif	/* MACH_IPC_COMPAT */
 
 /*
  *	Set/Get special properties of memory associated
- *	to some virtual address range, such as cachability, 
+ *	to some virtual address range, such as cachability,
  *	migrability, replicability.  Machine-dependent.
  */
 routine vm_machine_attribute(
diff --git a/include/mach/memory_object.defs b/include/mach/memory_object.defs
index e64be877..e7fc12fc 100644
--- a/include/mach/memory_object.defs
+++ b/include/mach/memory_object.defs
@@ -2,24 +2,24 @@
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -33,18 +33,18 @@
 subsystem
 #if	KERNEL_USER
 	  KernelUser
-#endif	KERNEL_USER
+#endif	/* KERNEL_USER */
 #if	KERNEL_SERVER
 	  KernelServer
-#endif	KERNEL_SERVER
+#endif	/* KERNEL_SERVER */
 		     memory_object 2200;
 
 #ifdef	KERNEL
 #include <norma_vm.h>
 #if	NORMA_VM
 userprefix k_;
-#endif	NORMA_VM
-#endif	KERNEL
+#endif	/* NORMA_VM */
+#endif	/* KERNEL */
 
 #include <mach/std_types.defs>
 #include <mach/mach_types.defs>
@@ -52,7 +52,7 @@ userprefix k_;
 #if	SEQNOS
 serverprefix seqnos_;
 serverdemux seqnos_memory_object_server;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 
 /*
  *	Initialize the specified memory object, providing
@@ -69,7 +69,7 @@ simpleroutine	memory_object_init(
 		memory_object		: memory_object_t;
 #if	SEQNOS
 	msgseqno seqno			: mach_port_seqno_t;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 		memory_control		: memory_object_control_t =
 						MACH_MSG_TYPE_MAKE_SEND
 						ctype: mach_port_t;
@@ -95,7 +95,7 @@ simpleroutine	memory_object_terminate(
 						ctype: mach_port_t;
 #if	SEQNOS
 	msgseqno seqno			: mach_port_seqno_t;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 		memory_control		: memory_object_control_t =
 						MACH_MSG_TYPE_MOVE_RECEIVE
 						ctype: mach_port_t
diff --git a/include/mach/std_types.defs b/include/mach/std_types.defs
index aef7dba8..b0011f1b 100644
--- a/include/mach/std_types.defs
+++ b/include/mach/std_types.defs
@@ -2,24 +2,24 @@
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -124,8 +124,8 @@ type port_rcv_t = MACH_MSG_TYPE_MOVE_RECEIVE
 type port_array_t = ^array[] of port_t
 	ctype: mach_port_array_t;
 
-#endif	MACH_IPC_COMPAT
+#endif	/* MACH_IPC_COMPAT */
 
 import <mach/std_types.h>;
 
-#endif	_MACH_STD_TYPES_DEFS_
+#endif	/* _MACH_STD_TYPES_DEFS_ */
diff --git a/include/mach_debug/hash_info.h b/include/mach_debug/hash_info.h
index 19a039f4..6944277d 100644
--- a/include/mach_debug/hash_info.h
+++ b/include/mach_debug/hash_info.h
@@ -1,25 +1,25 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -38,4 +38,4 @@ typedef struct hash_info_bucket {
 
 typedef hash_info_bucket_t *hash_info_bucket_array_t;
 
-#endif	_MACH_DEBUG_HASH_INFO_H_
+#endif	/* _MACH_DEBUG_HASH_INFO_H_ */
diff --git a/include/mach_debug/ipc_info.h b/include/mach_debug/ipc_info.h
index 8d2cafeb..ef0b0c6a 100644
--- a/include/mach_debug/ipc_info.h
+++ b/include/mach_debug/ipc_info.h
@@ -1,25 +1,25 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -97,4 +97,4 @@ typedef ipc_info_tree_name_t *ipc_info_tree_name_array_t;
 #define	IPC_INFO_TYPE_XMM_PAGER		11
 #define IPC_INFO_TYPE_PAGING_NAME	12
 
-#endif	_MACH_DEBUG_IPC_INFO_H_
+#endif	/* _MACH_DEBUG_IPC_INFO_H_ */
diff --git a/include/mach_debug/mach_debug.defs b/include/mach_debug/mach_debug.defs
index 72210346..dc4050fd 100644
--- a/include/mach_debug/mach_debug.defs
+++ b/include/mach_debug/mach_debug.defs
@@ -1,25 +1,25 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -36,7 +36,7 @@
 subsystem
 #if	KERNEL_SERVER
 	  KernelServer
-#endif	KERNEL_SERVER
+#endif	/* KERNEL_SERVER */
 		       mach_debug 3000;
 
 #include <mach/std_types.defs>
@@ -115,13 +115,13 @@ routine mach_port_dnrequest_info(
 	out	total		: unsigned;	/* total size of table */
 	out	used		: unsigned);	/* amount used */
 
-#else	!defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG
+#else	/* !defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG */
 skip;	/* mach_port_get_srights */
 skip;	/* host_ipc_hash_info */
 skip;	/* host_ipc_marequest_info */
 skip;	/* mach_port_space_info */
 skip;	/* mach_port_dnrequest_info */
-#endif	!defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG
+#endif	/* !defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG */
 
 skip;	/* mach_vm_region_info */
 skip;	/* vm_mapped_pages_info */
@@ -164,9 +164,9 @@ routine host_virtual_physical_table_info(
 	out	info		: hash_info_bucket_array_t,
 					CountInOut, Dealloc);
 
-#else	!defined(MACH_VM_DEBUG) || MACH_VM_DEBUG
+#else	/* !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG */
 skip;	/* host_virtual_physical_table_info */
-#endif	!defined(MACH_VM_DEBUG) || MACH_VM_DEBUG
+#endif	/* !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG */
 
 #if	!defined(MACH_KDB) || MACH_KDB
 /*
@@ -181,9 +181,9 @@ routine host_load_symbol_table(
 		name		: symtab_name_t;
 		symtab		: pointer_t);
 
-#else	!defined(MACH_KDB) || MACH_KDB
+#else	/* !defined(MACH_KDB) || MACH_KDB */
 skip;	/* host_load_symbol_table */
-#endif	!defined(MACH_KDB) || MACH_KDB
+#endif	/* !defined(MACH_KDB) || MACH_KDB */
 
 #if	!defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG
 
@@ -198,9 +198,9 @@ routine	mach_port_kernel_object(
 	out	object_type	: unsigned;
 	out	object_addr	: vm_offset_t);
 
-#else	!defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG
+#else	/* !defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG */
 skip;	/* mach_port_kernel_object */
-#endif	!defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG
+#endif	/* !defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG */
 
 #if	!defined(MACH_VM_DEBUG) || MACH_VM_DEBUG
 
@@ -234,8 +234,8 @@ routine mach_vm_object_pages(
 	out	pages		: vm_page_info_array_t,
 					CountInOut, Dealloc);
 
-#else	!defined(MACH_VM_DEBUG) || MACH_VM_DEBUG
+#else	/* !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG */
 skip;	/* mach_vm_region_info */
 skip;	/* mach_vm_object_info */
 skip;	/* mach_vm_object_pages */
-#endif	!defined(MACH_VM_DEBUG) || MACH_VM_DEBUG
+#endif	/* !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG */
diff --git a/include/mach_debug/mach_debug_types.defs b/include/mach_debug/mach_debug_types.defs
index 64564ab2..9f1976fe 100644
--- a/include/mach_debug/mach_debug_types.defs
+++ b/include/mach_debug/mach_debug_types.defs
@@ -1,25 +1,25 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -62,4 +62,4 @@ type symtab_name_t = (MACH_MSG_TYPE_STRING_C, 8*32);
 
 import <mach_debug/mach_debug_types.h>;
 
-#endif	_MACH_DEBUG_MACH_DEBUG_TYPES_DEFS_
+#endif	/* _MACH_DEBUG_MACH_DEBUG_TYPES_DEFS_ */
diff --git a/include/mach_debug/mach_debug_types.h b/include/mach_debug/mach_debug_types.h
index 9eb89548..2ba0cb1f 100644
--- a/include/mach_debug/mach_debug_types.h
+++ b/include/mach_debug/mach_debug_types.h
@@ -1,25 +1,25 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -37,4 +37,4 @@
 
 typedef	char	symtab_name_t[32];
 
-#endif	_MACH_DEBUG_MACH_DEBUG_TYPES_H_
+#endif	/* _MACH_DEBUG_MACH_DEBUG_TYPES_H_ */
diff --git a/include/mach_debug/vm_info.h b/include/mach_debug/vm_info.h
index 3800cbd6..70ba8878 100644
--- a/include/mach_debug/vm_info.h
+++ b/include/mach_debug/vm_info.h
@@ -1,25 +1,25 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -129,4 +129,4 @@ typedef struct vm_page_info {
 
 typedef vm_page_info_t *vm_page_info_array_t;
 
-#endif	_MACH_DEBUG_VM_INFO_H_
+#endif	/* _MACH_DEBUG_VM_INFO_H_ */
diff --git a/include/mach_debug/zone_info.h b/include/mach_debug/zone_info.h
index 623bd58d..1b36fe02 100644
--- a/include/mach_debug/zone_info.h
+++ b/include/mach_debug/zone_info.h
@@ -1,25 +1,25 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -58,4 +58,4 @@ typedef struct zone_info {
 
 typedef zone_info_t *zone_info_array_t;
 
-#endif	_MACH_DEBUG_ZONE_INFO_H_
+#endif	/* _MACH_DEBUG_ZONE_INFO_H_ */
diff --git a/include/sys/ioctl.h b/include/sys/ioctl.h
index 732494dc..1df6b732 100644
--- a/include/sys/ioctl.h
+++ b/include/sys/ioctl.h
@@ -2,7 +2,7 @@
  * Mach Operating System
  * Copyright (c) 1991 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
@@ -49,4 +49,4 @@
 #define	_IOW(g,n,t)	_IOC(IOC_IN,	(g), (n), sizeof(t))
 #define	_IOWR(g,n,t)	_IOC(IOC_INOUT,	(g), (n), sizeof(t))
 
-#endif	 _MACH_SYS_IOCTL_H_
+#endif	 /* _MACH_SYS_IOCTL_H_ */
diff --git a/include/sys/time.h b/include/sys/time.h
index ab96678e..de97d325 100644
--- a/include/sys/time.h
+++ b/include/sys/time.h
@@ -2,7 +2,7 @@
  * Mach Operating System
  * Copyright (c) 1991 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
@@ -50,4 +50,4 @@ extern time_value_t	time;
 	 (tvp)->tv_sec == (uvp)->tv_sec && (tvp)->tv_usec cmp (uvp)->tv_usec)
 #define timerclear(tvp)		(tvp)->tv_sec = (tvp)->tv_usec = 0
 
-#endif _MACH_SA_SYS_TIME_H_
+#endif /* _MACH_SA_SYS_TIME_H_ */