hurd: fix compilation of signal.h in C++

This commit is contained in:
Samuel Thibault 2015-02-07 22:39:38 +01:00
parent 22395607bc
commit f96ec27aa9
2 changed files with 5 additions and 4 deletions

View File

@ -27,8 +27,9 @@
__mach_msg. If that returns MACH_RCV_INTERRUPTED, set ERR to EINTR.
* hurd/hurdselect.c (_hurd_select): Remove unreachable check for
MACH_RCV_TIMED_OUT.
* hurd/hurd/signal.h (_hurd_self_sigstate): Explicit cast from void *
to struct hurd_sigstate **.
* hurd/hurd/signal.h (_hurd_self_sigstate,
_hurd_critical_section_lock, _hurd_critical_section_unlock):
Explicit casts from void *.
[BZ #4719]
* sysdeps/mach/hurd/bits/ioctls.h (_IOT__IOTBASE_long, _IOT_char,

View File

@ -167,7 +167,7 @@ extern int _hurd_core_limit;
_HURD_SIGNAL_H_EXTERN_INLINE void *
_hurd_critical_section_lock (void)
{
struct hurd_sigstate **location =
struct hurd_sigstate **location = (struct hurd_sigstate **)
(void *) __hurd_threadvar_location (_HURD_THREADVAR_SIGSTATE);
struct hurd_sigstate *ss = *location;
if (ss == NULL)
@ -198,7 +198,7 @@ _hurd_critical_section_unlock (void *our_lock)
else
{
/* It was us who acquired the critical section lock. Unlock it. */
struct hurd_sigstate *ss = our_lock;
struct hurd_sigstate *ss = (struct hurd_sigstate *) our_lock;
sigset_t pending;
__spin_lock (&ss->lock);
__spin_unlock (&ss->critical_section_lock);