about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2015-02-07 22:35:35 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2015-02-07 22:35:35 +0100
commit22395607bcc8caa4dc9cf17f6fd141ea6395fcda (patch)
treecc3c0edd2194c5347c92bc1a9c21d299830357b6
parentf05826f07fc48a2dd44bf92170ce6c71b29f7693 (diff)
downloadglibc-22395607bcc8caa4dc9cf17f6fd141ea6395fcda.tar.gz
glibc-22395607bcc8caa4dc9cf17f6fd141ea6395fcda.tar.xz
glibc-22395607bcc8caa4dc9cf17f6fd141ea6395fcda.zip
hurd: fix compilation of signal.h in C++
-rw-r--r--ChangeLog2
-rw-r--r--hurd/hurd/signal.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7334e532a7..f8e36ed104 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 e332242291..f844f0e2ea 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 ());