From f29e33843f75a7d22e262864188c502f4367f6ba Mon Sep 17 00:00:00 2001 From: Roland McGrath <roland@gnu.org> Date: Sun, 7 Oct 2001 22:36:02 +0000 Subject: 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. --- include/device/device_reply.defs | 24 ++++++++++++------------ include/mach/memory_object.defs | 24 ++++++++++++------------ include/mach/memory_object_default.defs | 32 ++++++++++++++++---------------- 3 files changed, 40 insertions(+), 40 deletions(-) (limited to 'include') diff --git a/include/device/device_reply.defs b/include/device/device_reply.defs index 03c17f5d..34156776 100644 --- a/include/device/device_reply.defs +++ b/include/device/device_reply.defs @@ -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. */ @@ -51,7 +51,7 @@ userprefix ds_; #if SEQNOS serverprefix seqnos_; serverdemux seqnos_device_reply_server; -#endif SEQNOS +#endif /* SEQNOS */ type reply_port_t = polymorphic|MACH_MSG_TYPE_PORT_SEND_ONCE ctype: mach_port_t; @@ -60,7 +60,7 @@ simpleroutine device_open_reply( reply_port : reply_port_t; #if SEQNOS msgseqno seqno : mach_port_seqno_t; -#endif SEQNOS +#endif /* SEQNOS */ in return_code : kern_return_t; in device_port : mach_port_make_send_t ); @@ -71,7 +71,7 @@ simpleroutine device_write_reply( reply_port : reply_port_t; #if SEQNOS msgseqno seqno : mach_port_seqno_t; -#endif SEQNOS +#endif /* SEQNOS */ in return_code : kern_return_t; in bytes_written : int ); @@ -80,7 +80,7 @@ simpleroutine device_write_reply_inband( reply_port : reply_port_t; #if SEQNOS msgseqno seqno : mach_port_seqno_t; -#endif SEQNOS +#endif /* SEQNOS */ in return_code : kern_return_t; in bytes_written : int ); @@ -89,7 +89,7 @@ simpleroutine device_read_reply( reply_port : reply_port_t; #if SEQNOS msgseqno seqno : mach_port_seqno_t; -#endif SEQNOS +#endif /* SEQNOS */ in return_code : kern_return_t; in data : io_buf_ptr_t, dealloc ); @@ -98,7 +98,7 @@ simpleroutine device_read_reply_inband( reply_port : reply_port_t; #if SEQNOS msgseqno seqno : mach_port_seqno_t; -#endif SEQNOS +#endif /* SEQNOS */ in return_code : kern_return_t; in data : io_buf_ptr_inband_t ); diff --git a/include/mach/memory_object.defs b/include/mach/memory_object.defs index e7fc12fc..198b70c6 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 eb2aea7a..d39fa9a0 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 */ -- cgit v1.2.3