This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.21-37-gf96ec27


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  f96ec27aa9f8fe871973b898ee407fe17681b6a7 (commit)
      from  22395607bcc8caa4dc9cf17f6fd141ea6395fcda (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f96ec27aa9f8fe871973b898ee407fe17681b6a7

commit f96ec27aa9f8fe871973b898ee407fe17681b6a7
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Sat Feb 7 22:39:38 2015 +0100

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

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);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |    5 +++--
 hurd/hurd/signal.h |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]