diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-02-04 22:13:20 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-02-04 22:13:20 +0000 |
commit | b8df40b734d3df9979fd578556fa1d70f2ada743 (patch) | |
tree | ba33735d41593ea1abc8140011952a572c1a6feb /libc/nptl/pthread_rwlock_timedwrlock.c | |
parent | e1bdacc1e71d0c59aa53f7ea1de37c3f8912d3b8 (diff) |
Merge changes between r12321 and r12643 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@12751 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/nptl/pthread_rwlock_timedwrlock.c')
-rw-r--r-- | libc/nptl/pthread_rwlock_timedwrlock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/nptl/pthread_rwlock_timedwrlock.c b/libc/nptl/pthread_rwlock_timedwrlock.c index e6283f462..6b3c75236 100644 --- a/libc/nptl/pthread_rwlock_timedwrlock.c +++ b/libc/nptl/pthread_rwlock_timedwrlock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2003,2004,2007,2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003. @@ -32,7 +32,7 @@ pthread_rwlock_timedwrlock (rwlock, abstime) { int result = 0; - /* Make sure we are along. */ + /* Make sure we are alone. */ lll_lock (rwlock->__data.__lock, rwlock->__data.__shared); while (1) |