--- Gnu-Mach/include/mach/memory_object.defs	2020/09/02 04:43:10	1.1.1.2
+++ Gnu-Mach/include/mach/memory_object.defs	2020/09/02 04:48:09	1.1.1.4
@@ -39,16 +39,13 @@ subsystem
 #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>
 
+#ifdef	MEMORY_OBJECT_IMPORTS
+MEMORY_OBJECT_IMPORTS
+#endif
+
 #if	SEQNOS
 serverprefix seqnos_;
 serverdemux seqnos_memory_object_server;
@@ -92,7 +89,18 @@ simpleroutine	memory_object_init(
 simpleroutine	memory_object_terminate(
 		memory_object		: memory_object_t =
 						MACH_MSG_TYPE_MOVE_SEND
-						ctype: mach_port_t;
+						ctype: mach_port_t
+#ifdef	MEMORY_OBJECT_INTRAN
+						intran: MEMORY_OBJECT_INTRAN
+#endif
+#ifdef	MEMORY_OBJECT_INTRAN_PAYLOAD
+						intranpayload:
+						MEMORY_OBJECT_INTRAN_PAYLOAD
+#endif
+#ifdef	MEMORY_OBJECT_DESTRUCTOR
+					destructor: MEMORY_OBJECT_DESTRUCTOR
+#endif
+						;
 #if	SEQNOS
 	msgseqno seqno			: mach_port_seqno_t;
 #endif	/* SEQNOS */
@@ -228,7 +236,17 @@ simpleroutine	memory_object_data_write(
 simpleroutine	memory_object_lock_completed(
 		memory_object		: memory_object_t =
 			polymorphic|MACH_MSG_TYPE_PORT_SEND_ONCE
-			ctype: mach_port_t;
+			ctype: mach_port_t
+#ifdef	MEMORY_OBJECT_INTRAN
+			intran: MEMORY_OBJECT_INTRAN
+#endif
+#ifdef	MEMORY_OBJECT_INTRAN_PAYLOAD
+			intranpayload: MEMORY_OBJECT_INTRAN_PAYLOAD
+#endif
+#ifdef	MEMORY_OBJECT_DESTRUCTOR
+			destructor: MEMORY_OBJECT_DESTRUCTOR
+#endif
+			;
 #if	SEQNOS
 	msgseqno seqno			: mach_port_seqno_t;
 #endif	/* SEQNOS */
@@ -259,7 +277,17 @@ simpleroutine	memory_object_lock_complet
 simpleroutine	memory_object_supply_completed(
 		memory_object		: memory_object_t =
 			polymorphic|MACH_MSG_TYPE_PORT_SEND_ONCE
-			ctype: mach_port_t;
+			ctype: mach_port_t
+#ifdef	MEMORY_OBJECT_INTRAN
+			intran: MEMORY_OBJECT_INTRAN
+#endif
+#ifdef	MEMORY_OBJECT_INTRAN_PAYLOAD
+			intranpayload: MEMORY_OBJECT_INTRAN_PAYLOAD
+#endif
+#ifdef	MEMORY_OBJECT_DESTRUCTOR
+			destructor: MEMORY_OBJECT_DESTRUCTOR
+#endif
+			;
 #if	SEQNOS
 	msgseqno seqno			: mach_port_seqno_t;
 #endif	/* SEQNOS */
@@ -305,7 +333,17 @@ simpleroutine   memory_object_data_retur
 simpleroutine	memory_object_change_completed(
 		memory_object		: memory_object_t =
 			polymorphic|MACH_MSG_TYPE_PORT_SEND_ONCE
-			ctype: mach_port_t;
+			ctype: mach_port_t
+#ifdef	MEMORY_OBJECT_INTRAN
+			intran: MEMORY_OBJECT_INTRAN
+#endif
+#ifdef	MEMORY_OBJECT_INTRAN_PAYLOAD
+			intranpayload: MEMORY_OBJECT_INTRAN_PAYLOAD
+#endif
+#ifdef	MEMORY_OBJECT_DESTRUCTOR
+			destructor: MEMORY_OBJECT_DESTRUCTOR
+#endif
+			;
 #if	SEQNOS
 	msgseqno seqno			: mach_port_seqno_t;
 #endif	/* SEQNOS */