diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-11-14 23:35:35 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-11-15 13:16:03 +0100 |
| commit | 9446e02b0d2e94da4ebe9df6e2c5d23adc0f1d7d (patch) | |
| tree | 2d6a3d3036c0ddf314a09163619a0639359e72ed /hurd/hurd | |
| parent | 7ed2b6921feb51d3fecdd0b72e8ab7a7f37ba4ae (diff) | |
| download | glibc-9446e02b0d2e94da4ebe9df6e2c5d23adc0f1d7d.tar.gz glibc-9446e02b0d2e94da4ebe9df6e2c5d23adc0f1d7d.tar.xz glibc-9446e02b0d2e94da4ebe9df6e2c5d23adc0f1d7d.zip | |
hurd: Remove some remnants of cthreads
Libc has actually been using mach's lock-internal.h mutex for a long time already.
Diffstat (limited to 'hurd/hurd')
| -rw-r--r-- | hurd/hurd/fd.h | 5 | ||||
| -rw-r--r-- | hurd/hurd/id.h | 2 | ||||
| -rw-r--r-- | hurd/hurd/signal.h | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/hurd/hurd/fd.h b/hurd/hurd/fd.h index d27be21cfd..273406fbf8 100644 --- a/hurd/hurd/fd.h +++ b/hurd/hurd/fd.h @@ -21,8 +21,6 @@ #define _HURD_FD_H 1 #include <features.h> -#include <cthreads.h> - #include <hurd/hurd_types.h> #include <hurd/port.h> #include <sys/socket.h> @@ -47,9 +45,12 @@ struct hurd_fd /* Current file descriptor table. */ +#if defined __USE_EXTERN_INLINES && defined _LIBC +#include <lock-intern.h> extern int _hurd_dtablesize; extern struct hurd_fd **_hurd_dtable; extern struct mutex _hurd_dtable_lock; /* Locks those two variables. */ +#endif #include <hurd/signal.h> diff --git a/hurd/hurd/id.h b/hurd/hurd/id.h index bb796e1788..944df218d4 100644 --- a/hurd/hurd/id.h +++ b/hurd/hurd/id.h @@ -24,7 +24,7 @@ #include <errno.h> #include <bits/types/error_t.h> -#include <cthreads.h> /* For `struct mutex'. */ +#include <lock-intern.h> /* For `struct mutex'. */ /* Structure describing authorization data for the process. */ diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h index ef6a8e6687..c11f841172 100644 --- a/hurd/hurd/signal.h +++ b/hurd/hurd/signal.h @@ -37,7 +37,6 @@ #include <bits/sigaction.h> #include <hurd/msg.h> -#include <cthreads.h> /* For `struct mutex'. */ #include <setjmp.h> /* For `jmp_buf'. */ #include <spin-lock.h> struct hurd_signal_preemptor; /* <hurd/sigpreempt.h> */ @@ -120,8 +119,6 @@ struct hurd_sigstate extern struct hurd_sigstate *_hurd_sigstates; -extern struct mutex _hurd_siglock; /* Locks _hurd_sigstates. */ - /* Get the sigstate of a given thread, taking its lock. */ extern struct hurd_sigstate *_hurd_thread_sigstate (thread_t); @@ -320,7 +317,7 @@ _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler, /* Function run by the signal thread to receive from the signal port. */ -extern void _hurd_msgport_receive (void); +extern void *_hurd_msgport_receive (void *arg); /* Set up STATE with a thread state that, when resumed, is like `longjmp (_hurd_sigthread_fault_env, 1)'. */ |