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.

1 files changed, 28 insertions, 28 deletions

diff --git a/ipc/ipc_kmsg.c b/ipc/ipc_kmsg.c
index d860fd18..21a3ecfc 100644
--- a/ipc/ipc_kmsg.c
+++ b/ipc/ipc_kmsg.c
@@ -473,7 +473,7 @@ ipc_kmsg_free(kmsg)
 		/* return it to the norma ipc code */
 		norma_kmsg_put(kmsg);
 		break;
-#endif	NORMA_IPC
+#endif	/* NORMA_IPC */
 
 	    case IKM_SIZE_NETWORK:
 		/* return it to the network code */
@@ -1251,9 +1251,9 @@ ipc_kmsg_copyin_header(msg, space, notify)
 			reply_soright = IP_NULL;
 			goto skip_reply_checks;
 		}
-#else	MACH_IPC_COMPAT
+#else	/* MACH_IPC_COMPAT */
 		assert(kr == KERN_SUCCESS);
-#endif	MACH_IPC_COMPAT
+#endif	/* MACH_IPC_COMPAT */
 
 		if ((saved_reply != IP_NULL) && (reply_port == IO_DEAD)) {
 			ipc_port_t dest = (ipc_port_t) dest_port;
@@ -1321,7 +1321,7 @@ ipc_kmsg_copyin_header(msg, space, notify)
 		 *	and the port died on us.  In this case, the copyin
 		 *	code already deallocated reply_entry.
 		 */
-#endif	MACH_IPC_COMPAT
+#endif	/* MACH_IPC_COMPAT */
 
 		if (IE_BITS_TYPE(dest_entry->ie_bits) == MACH_PORT_TYPE_NONE)
 			ipc_entry_dealloc(space, dest_name, dest_entry);
@@ -1398,7 +1398,7 @@ ipc_kmsg_copyin_body(kmsg, space, map)
 		use_page_lists = TRUE;
 		steal_pages = TRUE;
 	}
-#endif	NORMA_IPC
+#endif	/* NORMA_IPC */
 
 	saddr = (vm_offset_t) (&kmsg->ikm_header + 1);
 	eaddr = (vm_offset_t) &kmsg->ikm_header + kmsg->ikm_header.msgh_size;
@@ -1482,7 +1482,7 @@ ipc_kmsg_copyin_body(kmsg, space, map)
 
 			if (sizeof(vm_offset_t) > sizeof(mach_msg_type_t))
 				saddr = ptr_align(saddr);
-			
+
 			if ((eaddr - saddr) < sizeof(vm_offset_t)) {
 				ipc_kmsg_clean_partial(kmsg, taddr, FALSE, 0);
 				return MACH_SEND_MSG_TOO_SMALL;
@@ -1786,7 +1786,7 @@ ipc_kmsg_copyin_from_kernel(
  *		Nothing locked.
  *	Returns:
  *		MACH_MSG_SUCCESS	Copied out port rights.
- *		MACH_RCV_INVALID_NOTIFY	
+ *		MACH_RCV_INVALID_NOTIFY
  *			Notify is non-null and doesn't name a receive right.
  *			(Either KERN_INVALID_NAME or KERN_INVALID_RIGHT.)
  *		MACH_RCV_HEADER_ERROR|MACH_MSG_IPC_SPACE
@@ -2746,7 +2746,7 @@ ipc_kmsg_copyout_to_kernel(kmsg, space)
 	kmsg->ikm_header.msgh_local_port = dest_name;
 	kmsg->ikm_header.msgh_remote_port = reply_name;
 }
-#endif	NORMA_IPC || NORMA_VM
+#endif	/* NORMA_IPC || NORMA_VM */
 
 #if	MACH_IPC_COMPAT
 
@@ -2829,7 +2829,7 @@ ipc_kmsg_copyin_compat(kmsg, space, map)
 		use_page_lists = TRUE;
 		steal_pages = TRUE;
 	}
-#endif	NORMA_IPC
+#endif	/* NORMA_IPC */
 
 	saddr = (vm_offset_t) (&kmsg->ikm_header + 1);
 	eaddr = (vm_offset_t) &kmsg->ikm_header + kmsg->ikm_header.msgh_size;
@@ -3211,7 +3211,7 @@ ipc_kmsg_copyout_compat(kmsg, space, map)
 	return MACH_MSG_SUCCESS;
 }
 
-#endif	MACH_IPC_COMPAT
+#endif	/* MACH_IPC_COMPAT */
 
 #include <mach_kdb.h>
 #if	MACH_KDB
@@ -3224,66 +3224,66 @@ ipc_type_name(type_name, received)
 	switch (type_name) {
 		case MACH_MSG_TYPE_BOOLEAN:
 		return "boolean";
-		
+
 		case MACH_MSG_TYPE_INTEGER_16:
 		return "short";
-		
+
 		case MACH_MSG_TYPE_INTEGER_32:
 		return "int32";
 
 		case MACH_MSG_TYPE_INTEGER_64:
 		return "int64";
-		
+
 		case MACH_MSG_TYPE_CHAR:
 		return "char";
-		
+
 		case MACH_MSG_TYPE_BYTE:
 		return "byte";
-		
+
 		case MACH_MSG_TYPE_REAL:
 		return "real";
-		
+
 		case MACH_MSG_TYPE_STRING:
 		return "string";
-		
+
 		case MACH_MSG_TYPE_PORT_NAME:
 		return "port_name";
-		
+
 		case MACH_MSG_TYPE_MOVE_RECEIVE:
 		if (received) {
 			return "port_receive";
 		} else {
 			return "move_receive";
 		}
-		
+
 		case MACH_MSG_TYPE_MOVE_SEND:
 		if (received) {
 			return "port_send";
 		} else {
 			return "move_send";
 		}
-		
+
 		case MACH_MSG_TYPE_MOVE_SEND_ONCE:
 		if (received) {
 			return "port_send_once";
 		} else {
 			return "move_send_once";
 		}
-		
+
 		case MACH_MSG_TYPE_COPY_SEND:
 		return "copy_send";
-		
+
 		case MACH_MSG_TYPE_MAKE_SEND:
 		return "make_send";
-		
+
 		case MACH_MSG_TYPE_MAKE_SEND_ONCE:
 		return "make_send_once";
-		
+
 		default:
 		return (char *) 0;
 	}
 }
-		
+
 void
 ipc_print_type_name(
 	int	type_name)
@@ -3313,9 +3313,9 @@ ipc_kmsg_print(kmsg)
 	db_printf(",page=0x%x,copy=0x%x\n",
 		  kmsg->ikm_page,
 		  kmsg->ikm_copy);
-#else	NORMA_IPC
+#else	/* NORMA_IPC */
 	db_printf("\n");
-#endif	NORMA_IPC
+#endif	/* NORMA_IPC */
 	ipc_msg_print(&kmsg->ikm_header);
 }
 
@@ -3481,4 +3481,4 @@ ipc_msg_print(msgh)
 		}
 	}
 }
-#endif	MACH_KDB
+#endif	/* MACH_KDB */