diff options
-rw-r--r-- | nptl/ChangeLog | 7 | ||||
-rw-r--r-- | nptl/pthread_rwlock_tryrdlock.c | 5 | ||||
-rw-r--r-- | nptl/pthread_rwlock_trywrlock.c | 5 |
3 files changed, 11 insertions, 6 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 03dd156dbb..3022aadb60 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,10 @@ +2012-12-28 Andi Kleen <ak@linux.intel.com> + + * pthread_rwlock_tryrdlock.c (__pthread_rwlock_tryrdlock): Convert + to prototype. + * pthread_rwlock_trywrlock.c (__pthread_rwlock_trywrlock): + Likewise. + 2012-12-27 David S. Miller <davem@davemloft.net> * sysdeps/unix/sysv/linux/sparc/lowlevellock.h diff --git a/nptl/pthread_rwlock_tryrdlock.c b/nptl/pthread_rwlock_tryrdlock.c index beaa970acf..1a49236415 100644 --- a/nptl/pthread_rwlock_tryrdlock.c +++ b/nptl/pthread_rwlock_tryrdlock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2002-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -22,8 +22,7 @@ int -__pthread_rwlock_tryrdlock (rwlock) - pthread_rwlock_t *rwlock; +__pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock) { int result = EBUSY; diff --git a/nptl/pthread_rwlock_trywrlock.c b/nptl/pthread_rwlock_trywrlock.c index 92750b83a2..920cf366fa 100644 --- a/nptl/pthread_rwlock_trywrlock.c +++ b/nptl/pthread_rwlock_trywrlock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2002-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -22,8 +22,7 @@ int -__pthread_rwlock_trywrlock (rwlock) - pthread_rwlock_t *rwlock; +__pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock) { int result = EBUSY; |