2001-10-07 Roland McGrath <roland@frob.com>

	* ddb/db_access.c: Fix obsolescent #else/#endif syntax.
	* device/dev_name.c: Likewise.
	* device/dev_pager.c: Likewise.
	* device/ds_routines.c: Likewise.
	* i386/i386/i386asm.sym: Likewise.
	* include/device/device_reply.defs: Likewise.
	* include/mach/memory_object.defs: Likewise.
	* include/mach/memory_object_default.defs: Likewise.

8 files changed, 84 insertions, 85 deletions

diff --git a/ddb/db_access.c b/ddb/db_access.c
index 7a39144..f2ec068 100644
--- a/ddb/db_access.c
+++ b/ddb/db_access.c
@@ -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.
  */
@@ -85,7 +85,7 @@ db_get_task_value(addr, size, is_signed, task)
 	{
 	    value = (value << 8) + (data[i] & 0xFF);
 	}
-	    
+
 	if (size <= sizeof(int)) {
 	    if (is_signed && (value & db_extend[size]) != 0)
 		value |= db_extend[size];
@@ -134,4 +134,4 @@ db_put_value(addr, size, value)
 	db_put_task_value(addr, size, value, TASK_NULL);
 }
 
-#endif MACH_KDB
+#endif /* MACH_KDB */
diff --git a/device/dev_name.c b/device/dev_name.c
index 99d9227..29a144b 100644
--- a/device/dev_name.c
+++ b/device/dev_name.c
@@ -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.
  */
@@ -104,7 +104,7 @@ boolean_t dev_name_lookup(name, ops, unit)
 
 #if 0
 	printf("lookup on name %s\n",name);
-#endif 0
+#endif /* 0 */
 
 	/*
 	 * Find device type name (characters before digit)
@@ -184,7 +184,7 @@ boolean_t dev_name_lookup(name, ops, unit)
 		 */
 #if 0
 		*unit = *unit * j + (c - 'a' +1);  /* +1 to start 'a' at 1 */
-#endif 0
+#endif /* 0 */
 		*unit += (c - 'a' +1);
 	    }
 	}
diff --git a/device/dev_pager.c b/device/dev_pager.c
index 2e76ed2..d37c57b 100644
--- a/device/dev_pager.c
+++ b/device/dev_pager.c
@@ -1,25 +1,25 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1993-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.
  */
@@ -352,9 +352,9 @@ kern_return_t	device_pager_data_request(
 
 #if	NORMA_VM
 	    object = vm_object_lookup(pager);
-#else	NORMA_VM
+#else	/* NORMA_VM */
 	    object = vm_object_lookup(pager_request);
-#endif	NORMA_VM
+#endif	/* NORMA_VM */
 	    if (object == VM_OBJECT_NULL) {
 		    (void) r_memory_object_data_error(pager_request,
 						      offset, length,
@@ -375,16 +375,16 @@ kern_return_t	device_pager_data_request(
 	    io_return_t			result;
 
 	    panic("(device_pager)data_request: dev pager");
-	    
+
 	    device = ds->device;
 	    mach_device_reference(device);
 	    dev_pager_deallocate(ds);
-	    
+
 	    /*
 	     * Package the read for the device driver.
 	     */
 	    io_req_alloc(ior, 0);
-	    
+
 	    ior->io_device	= device;
 	    ior->io_unit	= device->dev_number;
 	    ior->io_op		= IO_READ | IO_CALL;
@@ -398,11 +398,11 @@ kern_return_t	device_pager_data_request(
 	    ior->io_done	= device_pager_data_request_done;
 	    ior->io_reply_port	= pager_request;
 	    ior->io_reply_port_type = MACH_MSG_TYPE_PORT_SEND;
-	    
+
 	    result = (*device->dev_ops->d_read)(device->dev_number, ior);
 	    if (result == D_IO_QUEUED)
 		return (KERN_SUCCESS);
-	    
+
 	    /*
 	     * Return by queuing IOR for io_done thread, to reply in
 	     * correct environment (kernel).
@@ -429,7 +429,7 @@ boolean_t device_pager_data_request_done(register io_req_t	ior)
 	    if (ior->io_residual) {
 		if (device_pager_debug)
 		    printf("(device_pager)data_request_done: r: 0x%x\n",ior->io_residual);
-		bzero( (char *) (&ior->io_data[ior->io_count - 
+		bzero( (char *) (&ior->io_data[ior->io_count -
 					       ior->io_residual]),
 		      (unsigned) ior->io_residual);
 	    }
diff --git a/device/ds_routines.c b/device/ds_routines.c
index 7b74ad5..101dd32 100644
--- a/device/ds_routines.c
+++ b/device/ds_routines.c
@@ -163,7 +163,7 @@ ds_device_open(open_port, reply_port, reply_port_type,
 			return (MIG_NO_REPLY);
 		}
 	}
-#endif	NORMA_DEVICE
+#endif	/* NORMA_DEVICE */
 #endif	/* ! i386 */
 
 	/*
@@ -896,7 +896,7 @@ ds_device_read(device, reply_port, reply_port_type, mode, recnum,
 #ifdef lint
 	*data = *data;
 	*data_count = *data_count;
-#endif lint
+#endif /* lint */
 
 #ifndef i386
 	/*
@@ -996,7 +996,7 @@ ds_device_read_inband(device, reply_port, reply_port_type, mode, recnum,
 #ifdef lint
 	*data = *data;
 	*data_count = *data_count;
-#endif lint
+#endif /* lint */
 
 #ifndef i386
 	/*
@@ -1332,7 +1332,7 @@ ds_device_map(device, protection, offset, size, pager, unmap)
 
 #ifdef	lint
 	unmap = unmap;
-#endif	lint
+#endif	/* lint */
 	if (protection & ~VM_PROT_ALL)
 		return (KERN_INVALID_ARGUMENT);
 
diff --git a/i386/i386/i386asm.sym b/i386/i386/i386asm.sym
index e38a1bd..a120f5c 100644
--- a/i386/i386/i386asm.sym
+++ b/i386/i386/i386asm.sym
@@ -1,29 +1,29 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
- * Copyright (c) 1991 IBM Corporation 
+ * Copyright (c) 1991 IBM Corporation
  * 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,
- * and that the name IBM not be used in advertising or publicity 
+ * and that the name IBM not be used in advertising or publicity
  * pertaining to distribution of the software without specific, written
  * prior permission.
- * 
+ *
  * CARNEGIE MELLON AND IBM ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON AND IBM DISCLAIM 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.
  */
@@ -120,12 +120,12 @@ expr	(VM_MIN_KERNEL_ADDRESS>>PDESHIFT)*sizeof(pt_entry_t)	KERNELBASEPDE
 
 #if	MACH_KDB
 expr	RB_KDB
-#endif	MACH_KDB
+#endif	/* MACH_KDB */
 
 #if	NCPUS > 1
 offset	mp_desc_table		mp	gdt
 offset	mp_desc_table		mp	idt
-#endif	NCPUS > 1
+#endif	/* NCPUS > 1 */
 expr	INTSTACK_SIZE
 
 #if	!STAT_TIME
@@ -136,4 +136,3 @@ expr	TIMER_HIGH_UNIT
 offset	thread			th	system_timer
 offset	thread			th	user_timer
 #endif
-
diff --git a/include/device/device_reply.defs b/include/device/device_reply.defs
index 03c17f5..3415677 100644
--- a/include/device/device_reply.defs
+++ b/include/device/device_reply.defs
@@ -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.
  */
@@ -51,7 +51,7 @@ userprefix	ds_;
 #if	SEQNOS
 serverprefix seqnos_;
 serverdemux seqnos_device_reply_server;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 
 type reply_port_t = polymorphic|MACH_MSG_TYPE_PORT_SEND_ONCE
 	ctype: mach_port_t;
@@ -60,7 +60,7 @@ simpleroutine	device_open_reply(
 	    reply_port		: reply_port_t;
 #if	SEQNOS
 	msgseqno seqno		: mach_port_seqno_t;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 	in  return_code		: kern_return_t;
 	in  device_port		: mach_port_make_send_t
 	);
@@ -71,7 +71,7 @@ simpleroutine	device_write_reply(
 	    reply_port		: reply_port_t;
 #if	SEQNOS
 	msgseqno seqno		: mach_port_seqno_t;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 	in  return_code		: kern_return_t;
 	in  bytes_written	: int
 	);
@@ -80,7 +80,7 @@ simpleroutine	device_write_reply_inband(
 	    reply_port		: reply_port_t;
 #if	SEQNOS
 	msgseqno seqno		: mach_port_seqno_t;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 	in  return_code		: kern_return_t;
 	in  bytes_written	: int
 	);
@@ -89,7 +89,7 @@ simpleroutine	device_read_reply(
 	    reply_port		: reply_port_t;
 #if	SEQNOS
 	msgseqno seqno		: mach_port_seqno_t;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 	in  return_code		: kern_return_t;
 	in  data		: io_buf_ptr_t, dealloc
 	);
@@ -98,7 +98,7 @@ simpleroutine	device_read_reply_inband(
 	    reply_port		: reply_port_t;
 #if	SEQNOS
 	msgseqno seqno		: mach_port_seqno_t;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 	in  return_code		: kern_return_t;
 	in  data		: io_buf_ptr_inband_t
 	);
diff --git a/include/mach/memory_object.defs b/include/mach/memory_object.defs
index e7fc12f..198b70c 100644
--- a/include/mach/memory_object.defs
+++ b/include/mach/memory_object.defs
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
  * All Rights Reserved.
@@ -102,7 +102,7 @@ simpleroutine	memory_object_terminate(
 #if	KERNEL_USER
 		/* for compatibility with Mach 2.5 kernels */
 						, dealloc
-#endif	KERNEL_USER
+#endif	/* KERNEL_USER */
 						;
 		memory_object_name	: memory_object_name_t =
 						MACH_MSG_TYPE_MOVE_RECEIVE
@@ -110,7 +110,7 @@ simpleroutine	memory_object_terminate(
 #if	KERNEL_USER
 		/* for compatibility with Mach 2.5 kernels */
 						, dealloc
-#endif	KERNEL_USER
+#endif	/* KERNEL_USER */
 						);
 
 /*
@@ -143,7 +143,7 @@ simpleroutine	memory_object_copy(
 		old_memory_object	: memory_object_t;
 #if	SEQNOS
 	msgseqno seqno			: mach_port_seqno_t;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 		old_memory_control	: memory_object_control_t =
 						MACH_MSG_TYPE_MAKE_SEND
 						ctype: mach_port_t;
@@ -155,7 +155,7 @@ simpleroutine	memory_object_copy(
 #if	KERNEL_USER
 		/* for compatibility with Mach 2.5 kernels */
 						, dealloc
-#endif	KERNEL_USER
+#endif	/* KERNEL_USER */
 						);
 
 /*
@@ -169,7 +169,7 @@ simpleroutine	memory_object_data_request(
 		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;
@@ -188,7 +188,7 @@ simpleroutine	memory_object_data_unlock(
 		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;
@@ -210,7 +210,7 @@ simpleroutine	memory_object_data_write(
 		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;
@@ -231,7 +231,7 @@ simpleroutine	memory_object_lock_completed(
 			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_MAKE_SEND
 						ctype: mach_port_t;
@@ -262,7 +262,7 @@ simpleroutine	memory_object_supply_completed(
 			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_MAKE_SEND
 						ctype: mach_port_t;
@@ -286,7 +286,7 @@ simpleroutine   memory_object_data_return(
 		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;
@@ -308,6 +308,6 @@ simpleroutine	memory_object_change_completed(
 			ctype: mach_port_t;
 #if	SEQNOS
 	msgseqno seqno			: mach_port_seqno_t;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 		may_cache		: boolean_t;
 		copy_strategy		: memory_object_copy_strategy_t);
diff --git a/include/mach/memory_object_default.defs b/include/mach/memory_object_default.defs
index eb2aea7..d39fa9a 100644
--- a/include/mach/memory_object_default.defs
+++ b/include/mach/memory_object_default.defs
@@ -1,25 +1,25 @@
-/* 
+/*
  * 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.
  */
@@ -34,15 +34,15 @@
 subsystem
 #if	KERNEL_USER
 	  KernelUser
-#endif	KERNEL_USER
+#endif	/* KERNEL_USER */
 		     memory_object_default 2250;
 
 #ifdef	MACH_KERNEL
 #include <norma_vm.h>
 #if	NORMA_VM
 userprefix k_;
-#endif	NORMA_VM
-#endif	MACH_KERNEL
+#endif	/* NORMA_VM */
+#endif	/* MACH_KERNEL */
 
 #include <mach/std_types.defs>
 #include <mach/mach_types.defs>
@@ -50,7 +50,7 @@ userprefix k_;
 #if	SEQNOS
 serverprefix seqnos_;
 serverdemux seqnos_memory_object_default_server;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 
 /*
  *	Pass on responsibility for the new kernel-created memory
@@ -65,14 +65,14 @@ simpleroutine	memory_object_create(
 						ctype: mach_port_t;
 #if	SEQNOS
 	msgseqno seqno			: mach_port_seqno_t;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 		new_memory_object	: memory_object_t =
 						MACH_MSG_TYPE_MOVE_RECEIVE
 						ctype: mach_port_t
 #if	KERNEL_USER
 		/* for compatibility with Mach 2.5 kernels */
 						, dealloc
-#endif	KERNEL_USER
+#endif	/* KERNEL_USER */
 						;
 		new_object_size		: vm_size_t;
 		new_control_port	: memory_object_control_t =
@@ -93,7 +93,7 @@ simpleroutine	memory_object_data_initialize(
 		memory_object		: memory_object_t;
 #if	SEQNOS
 	msgseqno seqno			: mach_port_seqno_t;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 		memory_control_port	: memory_object_control_t =
 						MACH_MSG_TYPE_MAKE_SEND
 						ctype: mach_port_t;
@@ -110,12 +110,12 @@ simpleroutine	memory_object_data_terminate(
 		memory_object		: memory_object_t;
 #if	SEQNOS
 	msgseqno seqno			: mach_port_seqno_t;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 		memory_control_port	: memory_object_control_t =
 						MACH_MSG_TYPE_MAKE_SEND
 						ctype: mach_port_t;
 		offset			: vm_offset_t;
 		size			: vm_size_t);
-#else	0
+#else	/* 0 */
 skip;	/* memory_object_data_terminate */
-#endif	0
+#endif	/* 0 */