--- Gnu-Mach/include/mach/memory_object.defs	2020/09/02 04:36:57	1.1.1.1
+++ Gnu-Mach/include/mach/memory_object.defs	2020/09/02 04:45:40	1.1.1.3
@@ -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.
  */
@@ -33,26 +33,19 @@
 subsystem
 #if	KERNEL_USER
 	  KernelUser
-#endif	KERNEL_USER
+#endif	/* KERNEL_USER */
 #if	KERNEL_SERVER
 	  KernelServer
-#endif	KERNEL_SERVER
+#endif	/* KERNEL_SERVER */
 		     memory_object 2200;
 
-#ifdef	KERNEL
-#include <norma_vm.h>
-#if	NORMA_VM
-userprefix k_;
-#endif	NORMA_VM
-#endif	KERNEL
-
 #include <mach/std_types.defs>
 #include <mach/mach_types.defs>
 
 #if	SEQNOS
 serverprefix seqnos_;
 serverdemux seqnos_memory_object_server;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 
 /*
  *	Initialize the specified memory object, providing
@@ -69,7 +62,7 @@ simpleroutine	memory_object_init(
 		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;
@@ -95,14 +88,14 @@ simpleroutine	memory_object_terminate(
 						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_MOVE_RECEIVE
 						ctype: mach_port_t
 #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 +103,7 @@ simpleroutine	memory_object_terminate(
 #if	KERNEL_USER
 		/* for compatibility with Mach 2.5 kernels */
 						, dealloc
-#endif	KERNEL_USER
+#endif	/* KERNEL_USER */
 						);
 
 /*
@@ -143,7 +136,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 +148,7 @@ simpleroutine	memory_object_copy(
 #if	KERNEL_USER
 		/* for compatibility with Mach 2.5 kernels */
 						, dealloc
-#endif	KERNEL_USER
+#endif	/* KERNEL_USER */
 						);
 
 /*
@@ -169,7 +162,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 +181,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 +203,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 +224,7 @@ simpleroutine	memory_object_lock_complet
 			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 +255,7 @@ simpleroutine	memory_object_supply_compl
 			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 +279,7 @@ simpleroutine   memory_object_data_retur
 		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 +301,6 @@ simpleroutine	memory_object_change_compl
 			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);