diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-08-15 22:41:23 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-08-15 22:48:44 +0200 |
| commit | 9736920963258a90c69e60fb8896ce3e70d18d3e (patch) | |
| tree | ab97838bc546b01e7ac8b9c85723e9e940e8fb99 | |
| parent | 8c4e46337f2ef324f5af9863a962f070fd796cc1 (diff) | |
hurd: Add prototype for and thus fix _hurdsig_abort_rpcs call
This was actually not a problem since NULL was getting passed.
| -rw-r--r-- | hurd/hurd/signal.h | 6 | ||||
| -rw-r--r-- | hurd/thread-cancel.c | 11 |
2 files changed, 7 insertions, 10 deletions
diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h index 96b6fae007..290c455ad4 100644 --- a/hurd/hurd/signal.h +++ b/hurd/hurd/signal.h @@ -28,6 +28,7 @@ #include <mach/mach_types.h> #include <mach/port.h> #include <mach/message.h> +#include <thread_state.h> #include <hurd/hurd_types.h> #include <signal.h> #include <errno.h> @@ -183,6 +184,11 @@ _hurd_self_sigstate (void) } # endif #endif + +extern mach_port_t +_hurdsig_abort_rpcs (struct hurd_sigstate *ss, int signo, int sigthread, + struct machine_thread_all_state *state, int *state_change, + void (*reply) (void)); /* Thread listening on our message port; also called the "signal thread". */ diff --git a/hurd/thread-cancel.c b/hurd/thread-cancel.c index b648046c3d..669d92c606 100644 --- a/hurd/thread-cancel.c +++ b/hurd/thread-cancel.c @@ -22,15 +22,6 @@ #include <thread_state.h> -/* See hurdsig.c. */ -extern mach_port_t _hurdsig_abort_rpcs (struct hurd_sigstate *ss, - int signo, int sigthread, - struct machine_thread_all_state *, - int *state_change, - mach_port_t *reply_port, - mach_msg_type_name_t reply_port_type, - int untraced); - error_t hurd_thread_cancel (thread_t thread) { @@ -64,7 +55,7 @@ hurd_thread_cancel (thread_t thread) /* Interrupt any interruptible RPC now in progress. */ state.set = 0; - _hurdsig_abort_rpcs (ss, 0, 0, &state, &state_change, NULL, 0, 0); + _hurdsig_abort_rpcs (ss, 0, 0, &state, &state_change, NULL); if (state_change) err = __thread_set_state (thread, MACHINE_THREAD_STATE_FLAVOR, (natural_t *) &state.basic, |