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.

2 files changed, 28 insertions, 28 deletions

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 */