aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2015-02-07 22:39:38 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2015-02-07 22:41:23 +0100
commitf96ec27aa9f8fe871973b898ee407fe17681b6a7 (patch)
tree55ca0175efcf7554e905671ba666c7d3dc5aff25
parent22395607bcc8caa4dc9cf17f6fd141ea6395fcda (diff)
downloadglibc-f96ec27aa9f8fe871973b898ee407fe17681b6a7.zip
glibc-f96ec27aa9f8fe871973b898ee407fe17681b6a7.tar.gz
glibc-f96ec27aa9f8fe871973b898ee407fe17681b6a7.tar.bz2
hurd: fix compilation of signal.h in C++
-rw-r--r--ChangeLog5
-rw-r--r--hurd/hurd/signal.h4
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f8e36ed..ade2384 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 f844f0e..81d049c 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);