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.

3 files changed, 26 insertions, 26 deletions

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);