--- Gnu-Mach/ipc/ipc_marequest.h	2020/09/02 04:42:36	1.1.1.2
+++ Gnu-Mach/ipc/ipc_marequest.h	2020/09/02 04:45:07	1.1.1.3
@@ -34,10 +34,10 @@
 #ifndef	_IPC_IPC_MAREQUEST_H_
 #define _IPC_IPC_MAREQUEST_H_
 
-#include <mach_ipc_debug.h>
-
 #include <mach/kern_return.h>
 #include <mach/port.h>
+#include <mach_debug/hash_info.h>
+#include <ipc/ipc_types.h>
 
 /*
  *	A msg-accepted request is made when MACH_SEND_NOTIFY is used
@@ -70,29 +70,30 @@ typedef struct ipc_marequest {
 
 #define	IMAR_NULL		((ipc_marequest_t) 0)
 
+#define	IPC_MAREQUEST_SIZE	16
 
 extern void
-ipc_marequest_init();
+ipc_marequest_init(void);
 
 #if	MACH_IPC_DEBUG
 
 extern unsigned int
-ipc_marequest_info(/* unsigned int *, hash_info_bucket_t *, unsigned int */);
+ipc_marequest_info(unsigned int *, hash_info_bucket_t *, unsigned int);
 
 #endif	/* MACH_IPC_DEBUG */
 
 extern mach_msg_return_t
-ipc_marequest_create(/* ipc_space_t space, mach_port_t name,
-			ipc_port_t soright, ipc_marequest_t *marequestp */);
+ipc_marequest_create(ipc_space_t space, ipc_port_t port,
+		     mach_port_t notify, ipc_marequest_t *marequestp);
 
 extern void
-ipc_marequest_cancel(/* ipc_space_t space, mach_port_t name */);
+ipc_marequest_cancel(ipc_space_t space, mach_port_t name);
 
 extern void
-ipc_marequest_rename(/* ipc_space_t space,
-			mach_port_t old, mach_port_t new */);
+ipc_marequest_rename(ipc_space_t space,
+		     mach_port_t old, mach_port_t new);
 
 extern void
-ipc_marequest_destroy(/* ipc_marequest_t marequest */);
+ipc_marequest_destroy(ipc_marequest_t marequest);
 
 #endif	/* _IPC_IPC_MAREQUEST_H_ */