From 22395607bcc8caa4dc9cf17f6fd141ea6395fcda Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sat, 7 Feb 2015 22:35:35 +0100 Subject: [PATCH] hurd: fix compilation of signal.h in C++ --- ChangeLog | 2 ++ hurd/hurd/signal.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7334e53..f8e36ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,8 @@ __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 **. [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 e332242..f844f0e 100644 --- a/hurd/hurd/signal.h +++ b/hurd/hurd/signal.h @@ -132,7 +132,7 @@ extern struct hurd_sigstate *_hurd_self_sigstate (void) _HURD_SIGNAL_H_EXTERN_INLINE struct hurd_sigstate * _hurd_self_sigstate (void) { - struct hurd_sigstate **location = + struct hurd_sigstate **location = (struct hurd_sigstate **) (void *) __hurd_threadvar_location (_HURD_THREADVAR_SIGSTATE); if (*location == NULL) *location = _hurd_thread_sigstate (__mach_thread_self ()); -- 2.7.4