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, 19 insertions, 19 deletions

diff --git a/ddb/db_break.c b/ddb/db_break.c
index d0ce1fc..54339ee 100644
--- a/ddb/db_break.c
+++ b/ddb/db_break.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.
  */
@@ -93,7 +93,7 @@ db_add_thread_breakpoint(bkpt, task_thd, count, task_bpt)
 	register db_thread_breakpoint_t tp;
 
 	if (db_thread_break_init == FALSE) {
-	    for (tp = db_thread_break_list; 
+	    for (tp = db_thread_break_list;
 		tp < &db_thread_break_list[NTHREAD_LIST-1]; tp++)
 		tp->tb_next = tp+1;
 	    tp->tb_next = 0;
@@ -242,11 +242,11 @@ db_check_breakpoint_valid()
 		    tbp_next = tbp->tb_next;
 		    if (tbp->tb_task_thd == 0)
 			continue;
-		    if ((tbp->tb_is_task && 
+		    if ((tbp->tb_is_task &&
 			 db_lookup_task((task_t)(tbp->tb_task_thd)) < 0) ||
-			(!tbp->tb_is_task && 
+			(!tbp->tb_is_task &&
 			 db_lookup_thread((thread_t)(tbp->tb_task_thd)) < 0)) {
-			db_force_delete_breakpoint(bkpt, 
+			db_force_delete_breakpoint(bkpt,
 					tbp->tb_task_thd, tbp->tb_is_task);
 		    }
 		}
@@ -414,7 +414,7 @@ db_set_breakpoints()
 				BKPT_SET(bkpt->bkpt_inst), task);
 		    bkpt->flags |= BKPT_SET_IN_MEM;
 		} else {
-		    db_printf("Warning: cannot set breakpoint at %X ", 
+		    db_printf("Warning: cannot set breakpoint at %X ",
 				bkpt->address);
 		    if (task)
 			db_printf("in task %X\n", task);
@@ -448,7 +448,7 @@ db_clear_breakpoints()
 		}
 		if ((bkpt->flags & BKPT_SET_IN_MEM)
 		    && DB_CHECK_ACCESS(bkpt->address, BKPT_SIZE, task)) {
-		    inst = db_get_task_value(bkpt->address, BKPT_SIZE, FALSE, 
+		    inst = db_get_task_value(bkpt->address, BKPT_SIZE, FALSE,
 								task);
 		    if (inst != BKPT_SET(inst)) {
 			if (bkpt->flags & BKPT_USR_GLOBAL) {
@@ -497,9 +497,9 @@ db_set_temp_breakpoint(task, addr)
 	    db_printf("Too many thread_breakpoints.\n");
 	    return 0;
 	}
-	bkpt->bkpt_inst = db_get_task_value(bkpt->address, BKPT_SIZE, 
+	bkpt->bkpt_inst = db_get_task_value(bkpt->address, BKPT_SIZE,
 						FALSE, task);
-	db_put_task_value(bkpt->address, BKPT_SIZE, 
+	db_put_task_value(bkpt->address, BKPT_SIZE,
 				BKPT_SET(bkpt->bkpt_inst), task);
 	return bkpt;
 }
@@ -564,7 +564,7 @@ db_list_breakpoints()
 			    if (task_id < 0 || thread_id < 0)
 				db_printf("%0*X    ", 2*sizeof(vm_offset_t),
 					   tp->tb_task_thd);
-			    else	
+			    else
 				db_printf("task%03d.%-3d ", task_id, thread_id);
 			}
 		    }
@@ -603,7 +603,7 @@ db_delete_cmd()
 	boolean_t thd_bpt = FALSE;
 	db_expr_t addr;
 	int t;
-	
+
 	t = db_read_token();
 	if (t == tSLASH) {
 	    t = db_read_token();
@@ -645,7 +645,7 @@ db_delete_cmd()
 		user_space = TRUE;
 	}
 	if (!DB_VALID_ADDRESS((vm_offset_t) addr, user_space)) {
-	    db_printf("Address %#X is not in %s space\n", addr, 
+	    db_printf("Address %#X is not in %s space\n", addr,
 			(user_space)? "user": "kernel");
 	    db_error(0);
 	}
@@ -711,7 +711,7 @@ db_breakpoint_cmd(addr, have_addr, count, modif)
 		if (db_access_level <= DB_ACCESS_CURRENT && user_space
 			 && thread->task != db_current_task())
 		    db_error("Cannot set break point in inactive user space\n");
-		db_set_breakpoint(db_target_space(thread, user_space), 
+		db_set_breakpoint(db_target_space(thread, user_space),
 					(db_addr_t)addr, count,
 					(user_global)? THREAD_NULL: thread,
 					task_bpt);
@@ -730,4 +730,4 @@ db_listbreak_cmd()
 	db_list_breakpoints();
 }
 
-#endif MACH_KDB
+#endif /* MACH_KDB */