2002-01-01 Roland McGrath <roland@frob.com>

	* hurd_types.defs (RETURN_CODE_ARG): New macro, definition
	depends on [HAVE_MIG_RETCODE].
	* auth_reply.defs: Replace return code args with that.
	* crash_reply.defs: Likewise.
	* fsys_reply.defs: Likewise.
	* io_reply.defs: Likewise.
	* msg_reply.defs: Likewise.
	* process_reply.defs: Likewise.
	* startup_reply.defs: Likewise.

8 files changed, 52 insertions, 46 deletions

diff --git a/hurd/auth_reply.defs b/hurd/auth_reply.defs
index c44152d5..63dc7dca 100644
--- a/hurd/auth_reply.defs
+++ b/hurd/auth_reply.defs
@@ -31,12 +31,12 @@ skip; /* auth_makeauth */
 
 simpleroutine auth_user_authenticate_reply (
 	reply_port: reply_port_t;
-	in return_code: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	in newhandle: mach_port_send_t);
 
 simpleroutine auth_server_authenticate_reply (
 	reply_port: reply_port_t;
-	in return_code: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	in gen_uids: idarray_t;
 	in aux_uids: idarray_t;
 	in gen_gids: idarray_t;
diff --git a/hurd/crash_reply.defs b/hurd/crash_reply.defs
index 27880a15..ec6ddcd6 100644
--- a/hurd/crash_reply.defs
+++ b/hurd/crash_reply.defs
@@ -27,4 +27,4 @@ subsystem crash_reply 32100;	/* must match crash + 100 */
 
 simpleroutine crash_dump_task_reply (
 	ureply_port: mach_port_poly_t;
-	result: int, RETCODE);
+	RETURN_CODE_ARG);
diff --git a/hurd/fsys_reply.defs b/hurd/fsys_reply.defs
index 6af94882..5fdce5f4 100644
--- a/hurd/fsys_reply.defs
+++ b/hurd/fsys_reply.defs
@@ -28,23 +28,23 @@ type reply_port_t = polymorphic | MACH_MSG_TYPE_PORT_SEND_ONCE
 
 simpleroutine fsys_startup_reply (
 	reply_port: reply_port_t;
-!	errorcode: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	realnode: mach_port_send_t);
 
 simpleroutine fsys_goaway_reply (
 	reply_port: reply_port_t;
-	errorcode: kern_return_t, RETCODE);
+	RETURN_CODE_ARG);
 
 simpleroutine fsys_getroot_reply (
 	reply_port: reply_port_t;
-	errorcode: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	do_retry: retry_type;
 	retry_name: string_t;
 	file: mach_port_send_t);
 
 simpleroutine fsys_getfile_reply (
 	reply_port: reply_port_t;
-	errorcode: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	file: mach_port_send_t);
 
 simpleroutine fsys_syncfs_reply (
@@ -53,24 +53,24 @@ simpleroutine fsys_syncfs_reply (
 
 simpleroutine fsys_set_options_reply (
 	reply_port: reply_port_t;
-	errorcode: kern_return_t, RETCODE);
+	RETURN_CODE_ARG);
 
 simpleroutine fsys_getpriv_reply (
 	reply_port_: reply_port_t;
-	errorcode: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	host_priv: mach_port_send_t;
 	device_master: mach_port_send_t;
 	fstask: mach_port_send_t);
 
 simpleroutine fsys_init_reply (
 	reply_port: reply_port_t;
-	errorcode: kern_return_t, RETCODE);
+	RETURN_CODE_ARG);
 
 simpleroutine fsys_forward_reply (
 	reply_port: reply_port_t;
-	errorcode: kern_return_t, RETCODE);
+	RETURN_CODE_ARG);
 
 simpleroutine fsys_get_options_reply (
 	reply_port: reply_port_t;
-	errorcode: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	options: data_t);
diff --git a/hurd/hurd_types.defs b/hurd/hurd_types.defs
index 961922eb..a1e284f1 100644
--- a/hurd/hurd_types.defs
+++ b/hurd/hurd_types.defs
@@ -168,6 +168,12 @@ type sreply_port_t = MACH_MSG_TYPE_MAKE_SEND_ONCE | polymorphic
 #define SCP
 #endif
 
+#ifdef HAVE_MIG_RETCODE
+#define RETURN_CODE_ARG in return_code: kern_return_t, retcode
+#else
+#define RETURN_CODE_ARG in return_code: kern_return_t
+#endif
+
 
 #ifdef USERPREFIX
 userprefix USERPREFIX;
diff --git a/hurd/io_reply.defs b/hurd/io_reply.defs
index 121fdc88..dfc48e24 100644
--- a/hurd/io_reply.defs
+++ b/hurd/io_reply.defs
@@ -33,121 +33,121 @@ type reply_port_t = polymorphic | MACH_MSG_TYPE_MAKE_SEND_ONCE
 
 simpleroutine io_write_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	amount: int);
 
 simpleroutine io_read_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	data: data_t);
 
 simpleroutine io_seek_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	newp: off_t);
 
 simpleroutine io_readable_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	amount: int);
 
 simpleroutine io_set_all_openmodes_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE);
+	RETURN_CODE_ARG);
 
 simpleroutine io_get_openmodes_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	bits: int);
 
 simpleroutine io_set_some_openmodes_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE);
+	RETURN_CODE_ARG);
 
 simpleroutine io_clear_some_openmodes_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE);
+	RETURN_CODE_ARG);
 
 simpleroutine io_async_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	async_id_port: mach_port_send_t);
 
 simpleroutine io_mod_owner_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE);
+	RETURN_CODE_ARG);
 
 simpleroutine io_get_owner_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	owner: pid_t);
 
 simpleroutine io_get_icky_async_id_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	id_port: mach_port_send_t);
 
 simpleroutine io_select_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	select_result: int);
 
 simpleroutine io_stat_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	stat_info: io_statbuf_t);
 
 skip;  /* io_reauthenticate has no reply */
 
 simpleroutine io_restrict_auth_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	new_object: mach_port_send_t);
 
 simpleroutine io_duplicate_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	newport: mach_port_send_t);
 
 simpleroutine io_map_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	rdobject: mach_port_send_t;
 	wrobject: mach_port_send_t);
 
 simpleroutine io_map_cntl_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	memobj: mach_port_send_t);
 
 simpleroutine io_get_conch_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE);
+	RETURN_CODE_ARG);
 
 simpleroutine io_release_conch_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE);
+	RETURN_CODE_ARG);
 
 simpleroutine io_eofnotify_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE);
+	RETURN_CODE_ARG);
 
 simpleroutine io_prenotify_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE);
+	RETURN_CODE_ARG);
 
 simpleroutine io_postnotify_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE);
+	RETURN_CODE_ARG);
 
 simpleroutine io_readnotify_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE);
+	RETURN_CODE_ARG);
 
 simpleroutine io_readsleep_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE);
+	RETURN_CODE_ARG);
 
 simpleroutine io_sigio_reply (
 	reply: reply_port_t;
-	return_code: kern_return_t, RETCODE);
+	RETURN_CODE_ARG);
diff --git a/hurd/msg_reply.defs b/hurd/msg_reply.defs
index 5fe04664..c1b95fdc 100644
--- a/hurd/msg_reply.defs
+++ b/hurd/msg_reply.defs
@@ -26,7 +26,7 @@ type reply_port_t = polymorphic | MACH_MSG_TYPE_PORT_SEND_ONCE
 
 simpleroutine msg_sig_post_reply (
 	reply_port: reply_port_t;
-	in return_code: kern_return_t, RETCODE);
+	RETURN_CODE_ARG);
 
 skip; /* msg_proc_newids */
 skip; /* msg_add_auth */
@@ -52,4 +52,4 @@ skip; /* msg_startup_dosync */
 
 simpleroutine msg_sig_post_untraced_reply (
 	reply_port: reply_port_t;
-	in return_code: kern_return_t, RETCODE);
+	RETURN_CODE_ARG);
diff --git a/hurd/process_reply.defs b/hurd/process_reply.defs
index 7db13572..80d39293 100644
--- a/hurd/process_reply.defs
+++ b/hurd/process_reply.defs
@@ -39,7 +39,7 @@ skip; /* child */
 
 simpleroutine proc_setmsgport_reply (
 	reply_port: reply_port_t;
-	errorcode: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	in oldmsgport: mach_port_t);
 
 skip; /* reassign */
@@ -50,12 +50,12 @@ skip; /* get_arg_locations */
 
 simpleroutine proc_getmsgport_reply (
 	reply_port: reply_port_t;
-	errorcode: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	in msgports: mach_port_t);
 
 simpleroutine proc_wait_reply (
 	reply_port: reply_port_t;
-	errorcode: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	in status: int;
 	in sigcode: int;
 	in rusage: rusage_t;
diff --git a/hurd/startup_reply.defs b/hurd/startup_reply.defs
index 43fe93a6..a8462676 100644
--- a/hurd/startup_reply.defs
+++ b/hurd/startup_reply.defs
@@ -33,14 +33,14 @@ STARTUP_IMPORTS
 
 simpleroutine startup_essential_task_reply (
 	reply_port: reply_port_t;
-	errorcode: kern_return_t, RETCODE);
+	RETURN_CODE_ARG);
 
 skip;	/* startup_request_notification */
 skip;	/* startup_reboot */
 
 simpleroutine startup_procinit_reply (
 	reply_port: reply_port_t;
-	errorcode: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	startup_task: task_t;
 	auth: auth_t;
 	host_priv: mach_port_send_t;
@@ -48,5 +48,5 @@ simpleroutine startup_procinit_reply (
 
 simpleroutine startup_authinit_reply (
 	reply_port: reply_port_t;
-	errorcode: kern_return_t, RETCODE;
+	RETURN_CODE_ARG;
 	proc: mach_port_send_t);