diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-02-07 22:39:38 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-02-07 22:41:23 +0100 |
| commit | f96ec27aa9f8fe871973b898ee407fe17681b6a7 (patch) | |
| tree | 55ca0175efcf7554e905671ba666c7d3dc5aff25 | |
| parent | 22395607bcc8caa4dc9cf17f6fd141ea6395fcda (diff) | |
| download | glibc-f96ec27aa9f8fe871973b898ee407fe17681b6a7.tar.gz | |
hurd: fix compilation of signal.h in C++
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | hurd/hurd/signal.h | 4 |
2 files changed, 5 insertions, 4 deletions
@@ -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, diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h index f844f0e2ea..81d049c343 100644 --- a/hurd/hurd/signal.h +++ b/hurd/hurd/signal.h @@ -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); |