GNU C Library master sources branch siddhesh/wait_bitset updated. glibc-2.16-ports-merge-510-g528e6e7

[siddhesh at sourceware dot org]

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, siddhesh/wait_bitset has been updated
       via  528e6e7ab4389ffad0c506714c485498821554c1 (commit)
      from  0283c2ef8801b5ceb3211b6ff45683642411cdcc (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://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=528e6e7ab4389ffad0c506714c485498821554c1

commit 528e6e7ab4389ffad0c506714c485498821554c1
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date:   Wed Oct 24 13:01:52 2012 +0530

    Fixed minor nits based on Roland's comments
    
    http://sourceware.org/ml/libc-alpha/2012-10/msg00648.html

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 39e43d7..70c0919 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,13 +1,13 @@
 2012-10-22  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
-	* pthread_cond_timedwait.c (__pthread_cond_timedwait): Timeout
+	* pthread_cond_timedwait.c (__pthread_cond_timedwait): Time out
 	if absolute timeout is negative.
 	[__ASSUME_FUTEX_CLOCK_REALTIME &&
 	lll_futex_timed_wait_bitset]: Use lll_futex_timed_wait_bitset.
 	* sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
-	(lll_futex_timed_wait_bitset); Define.
+	(lll_futex_timed_wait_bitset): New macro.
 	* sysdeps/unix/sysv/linux/s390/lowlevellock.h
-	(lll_futex_timed_wait_bitset); Likewise.
+	(lll_futex_timed_wait_bitset): Likewise.
 
 2012-10-21  Jim Blandy  <jimb@codesourcery.com>
 	    Joseph Myers  <joseph@codesourcery.com>
diff --git a/nptl/pthread_cond_timedwait.c b/nptl/pthread_cond_timedwait.c
index 800aa86..b5661e6 100644
--- a/nptl/pthread_cond_timedwait.c
+++ b/nptl/pthread_cond_timedwait.c
@@ -109,8 +109,8 @@ __pthread_cond_timedwait (cond, mutex, abstime)
 
   while (1)
     {
-#if (!defined(__ASSUME_FUTEX_CLOCK_REALTIME) \
-     || !defined(lll_futex_timed_wait_bitset))
+#if (!defined __ASSUME_FUTEX_CLOCK_REALTIME \
+     || !defined lll_futex_timed_wait_bitset)
       struct timespec rt;
       {
 # ifdef __NR_clock_gettime
@@ -156,8 +156,8 @@ __pthread_cond_timedwait (cond, mutex, abstime)
       /* Enable asynchronous cancellation.  Required by the standard.  */
       cbuffer.oldtype = __pthread_enable_asynccancel ();
 
-#if (!defined(__ASSUME_FUTEX_CLOCK_REALTIME) \
-     || !defined(lll_futex_timed_wait_bitset))
+#if (!defined __ASSUME_FUTEX_CLOCK_REALTIME \
+     || !defined lll_futex_timed_wait_bitset)
       /* Wait until woken by signal or broadcast.  */
       err = lll_futex_timed_wait (&cond->__data.__futex,
 				  futex_val, &rt, pshared);

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

Summary of changes:
 nptl/ChangeLog                |    6 +++---
 nptl/pthread_cond_timedwait.c |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)


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