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

diff --git a/i386/i386at/conf.c b/i386/i386at/conf.c
index 1fc0dfa..40df714 100644
--- a/i386/i386at/conf.c
+++ b/i386/i386at/conf.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.
  */
@@ -47,7 +47,7 @@ extern int      pchdopen(),pchdread(),pchdwrite(),pchdgetstat(),pchdsetstat();
 #define pchdname                "pchd"
 #endif
 
-#endif	NHD > 0
+#endif	/* NHD > 0 */
 
 #include <aha.h>
 #if	NAHA > 0
@@ -66,20 +66,20 @@ int	cd_open(), cd_close(), cd_read(), cd_write();
 extern int	fdopen(), fdclose(), fdread(), fdwrite();
 extern int	fdgetstat(), fdsetstat(), fddevinfo();
 #define	fdname			"fd"
-#endif	NFD > 0
+#endif	/* NFD > 0 */
 
 #include <wt.h>
 #if	NWT > 0
 extern int	wtopen(), wtread(), wtwrite(), wtclose();
 #define	wtname			"wt"
-#endif	NWT > 0
+#endif	/* NWT > 0 */
 
 #include <pc586.h>
 #if	NPC586 > 0
 extern int	pc586open(), pc586output(), pc586getstat(), pc586setstat(),
 		pc586setinput();
 #define	pc586name		"pc"
-#endif NPC586 > 0
+#endif /* NPC586 > 0 */
 
 #include <ne.h>
 #if     NNE > 0
@@ -88,16 +88,16 @@ extern int      neopen(), neoutput(), negetstat(), nesetstat(), nesetinput();
 extern int      nefoutput();
 #endif /* FIPC */
 #define nename                  "ne"
-#endif  NNE > 0
+#endif  /* NNE > 0 */
 
 #include <ns8390.h>
 #if	NNS8390 > 0
 extern int	wd8003open(), eliiopen();
-extern int	ns8390output(), ns8390getstat(), ns8390setstat(), 
+extern int	ns8390output(), ns8390getstat(), ns8390setstat(),
 		ns8390setinput();
 #define	ns8390wdname		"wd"
 #define	ns8390elname		"el"
-#endif NNS8390 > 0
+#endif /* NNS8390 > 0 */
 
 #include <at3c501.h>
 #if	NAT3C501 > 0
@@ -105,21 +105,21 @@ extern int	at3c501open(), at3c501output(),
 		at3c501getstat(), at3c501setstat(),
 		at3c501setinput();
 #define	at3c501name		"et"
-#endif NAT3C501 > 0
+#endif /* NAT3C501 > 0 */
 
 #include <ul.h>
 #if NUL > 0
 extern int    ulopen(), uloutput(), ulgetstat(), ulsetstat(),
                ulsetinput();
 #define ulname                        "ul"
-#endif NUL > 0
+#endif /* NUL > 0 */
 
 #include <wd.h>
 #if NWD > 0
 extern int    wdopen(), wdoutput(), wdgetstat(), wdsetstat(),
               wdsetinput();
 #define wdname                        "wd"
-#endif NWD > 0
+#endif /* NWD > 0 */
 
 #include <hpp.h>
 #if NHPP > 0
@@ -133,14 +133,14 @@ extern int    hppopen(), hppoutput(), hppgetstat(), hppsetstat(),
 extern int	paropen(), paroutput(), pargetstat(), parsetstat(),
 		parsetinput();
 #define	parname		"par"
-#endif NPAR > 0
+#endif /* NPAR > 0 */
 
 #include <de6c.h>
 #if	NDE6C > 0
 extern int	de6copen(), de6coutput(), de6cgetstat(), de6csetstat(),
 		de6csetinput();
 #define	de6cname		"de"
-#endif NDE6C > 0
+#endif /* NDE6C > 0 */
 
 extern int	kdopen(), kdclose(), kdread(), kdwrite();
 extern int	kdgetstat(), kdsetstat(), kdportdeath();
@@ -152,14 +152,14 @@ extern vm_offset_t kdmmap();
 extern int	comopen(), comclose(), comread(), comwrite();
 extern int	comgetstat(), comsetstat(), comportdeath();
 #define	comname			"com"
-#endif	NCOM > 0
+#endif	/* NCOM > 0 */
 
 #include <lpr.h>
 #if	NLPR > 0
 extern int	lpropen(), lprclose(), lprread(), lprwrite();
 extern int	lprgetstat(), lprsetstat(), lprportdeath();
 #define	lprname			"lpr"
-#endif	NLPR > 0
+#endif	/* NLPR > 0 */
 
 #include <blit.h>
 #if NBLIT > 0
@@ -219,7 +219,7 @@ struct dev_ops	dev_name_list[] =
 	  hdwrite,	hdgetstat,	hdsetstat,	nomap,
 	  nodev,	nulldev,	nulldev,	1024,
 	  hddevinfo },
-#endif	NHD > 0
+#endif	/* NHD > 0 */
 
 #if	NAHA > 0
 	{ rzname,	rz_open,	rz_close,	rz_read,
@@ -249,14 +249,14 @@ struct dev_ops	dev_name_list[] =
 	  fdwrite,	fdgetstat,	fdsetstat,	nomap,
 	  nodev,	nulldev,	nulldev,	64,
 	  fddevinfo },
-#endif	NFD > 0
+#endif	/* NFD > 0 */
 
 #if	NWT > 0
 	{ wtname,	wtopen,		wtclose,	wtread,
 	  wtwrite,	nulldev,	nulldev,	nomap,
 	  nodev,	nulldev,	nulldev,	0,
 	  nodev },
-#endif	NWT > 0
+#endif	/* NWT > 0 */
 
 #if	NPC586 > 0
 	{ pc586name,	pc586open,	nulldev,	nulldev,
@@ -373,7 +373,7 @@ struct dev_ops	dev_name_list[] =
 	  pchdwrite,	pchdgetstat,	pchdsetstat,	nomap,
 	  nodev,	nulldev,	nulldev,	16,
 	  hddevinfo },
-#endif	NHD > 0
+#endif	/* NHD > 0 */
 #endif
 
 #if 0
@@ -382,8 +382,8 @@ struct dev_ops	dev_name_list[] =
           hdwrite,      hdgetstat,      hdsetstat,      nomap,
           nodev,        nulldev,        nulldev,        16,
           hddevinfo },
-#endif  NHD > 0
-#endif 0 /* Kevin doesn't know why this was here. */
+#endif  /* NHD > 0 */
+#endif /* Kevin doesn't know why this was here. */
 
 #ifdef	MACH_KMSG
         { kmsgname,     kmsgopen,       kmsgclose,       kmsgread,