12 files changed, 24 insertions, 41 deletions
diff --git a/nptl/cleanup_defer_compat.c b/nptl/cleanup_defer_compat.c
index bd70b89556..e4fa87dd01 100644
--- a/nptl/cleanup_defer_compat.c
+++ b/nptl/cleanup_defer_compat.c
@@ -59,9 +59,8 @@ strong_alias (_pthread_cleanup_push_defer, __pthread_cleanup_push_defer)
 
 
 void
-_pthread_cleanup_pop_restore (buffer, execute)
-     struct _pthread_cleanup_buffer *buffer;
-     int execute;
+_pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *buffer,
+			      int execute)
 {
   struct pthread *self = THREAD_SELF;
 
diff --git a/nptl/old_pthread_cond_init.c b/nptl/old_pthread_cond_init.c
index 815e67e15a..f64095b15c 100644
--- a/nptl/old_pthread_cond_init.c
+++ b/nptl/old_pthread_cond_init.c
@@ -23,9 +23,8 @@
 
 #if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
 int
-__pthread_cond_init_2_0 (cond, cond_attr)
-     pthread_cond_2_0_t *cond;
-     const pthread_condattr_t *cond_attr;
+__pthread_cond_init_2_0 (pthread_cond_2_0_t *cond,
+			 const pthread_condattr_t *cond_attr)
 {
   struct pthread_condattr *icond_attr = (struct pthread_condattr *) cond_attr;
 
diff --git a/nptl/old_pthread_cond_timedwait.c b/nptl/old_pthread_cond_timedwait.c
index 501f2abb23..b98884febd 100644
--- a/nptl/old_pthread_cond_timedwait.c
+++ b/nptl/old_pthread_cond_timedwait.c
@@ -25,10 +25,8 @@
 
 #if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
 int
-__pthread_cond_timedwait_2_0 (cond, mutex, abstime)
-     pthread_cond_2_0_t *cond;
-     pthread_mutex_t *mutex;
-     const struct timespec *abstime;
+__pthread_cond_timedwait_2_0 (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex,
+			      const struct timespec *abstime)
 {
   if (cond->cond == NULL)
     {
diff --git a/nptl/pthread_barrier_init.c b/nptl/pthread_barrier_init.c
index 8fe15ecba5..bf5b002068 100644
--- a/nptl/pthread_barrier_init.c
+++ b/nptl/pthread_barrier_init.c
@@ -29,10 +29,8 @@ static const struct pthread_barrierattr default_barrierattr =
 
 
 int
-__pthread_barrier_init (barrier, attr, count)
-     pthread_barrier_t *barrier;
-     const pthread_barrierattr_t *attr;
-     unsigned int count;
+__pthread_barrier_init (pthread_barrier_t *barrier,
+			const pthread_barrierattr_t *attr, unsigned int count)
 {
   struct pthread_barrier *ibarrier;
 
diff --git a/nptl/pthread_barrierattr_getpshared.c b/nptl/pthread_barrierattr_getpshared.c
index 174161f25b..de62be896d 100644
--- a/nptl/pthread_barrierattr_getpshared.c
+++ b/nptl/pthread_barrierattr_getpshared.c
@@ -20,9 +20,8 @@
 
 
 int
-pthread_barrierattr_getpshared (attr, pshared)
-     const pthread_barrierattr_t *attr;
-     int *pshared;
+pthread_barrierattr_getpshared (const pthread_barrierattr_t *attr,
+				int *pshared)
 {
   *pshared = ((const struct pthread_barrierattr *) attr)->pshared;
 
diff --git a/nptl/pthread_getschedparam.c b/nptl/pthread_getschedparam.c
index 5de8924007..7c38223b6f 100644
--- a/nptl/pthread_getschedparam.c
+++ b/nptl/pthread_getschedparam.c
@@ -23,10 +23,8 @@
 
 
 int
-__pthread_getschedparam (threadid, policy, param)
-     pthread_t threadid;
-     int *policy;
-     struct sched_param *param;
+__pthread_getschedparam (pthread_t threadid, int *policy,
+			 struct sched_param *param)
 {
   struct pthread *pd = (struct pthread *) threadid;
 
diff --git a/nptl/pthread_mutex_setprioceiling.c b/nptl/pthread_mutex_setprioceiling.c
index 1be7471c91..0edaa241df 100644
--- a/nptl/pthread_mutex_setprioceiling.c
+++ b/nptl/pthread_mutex_setprioceiling.c
@@ -24,10 +24,8 @@
 
 
 int
-pthread_mutex_setprioceiling (mutex, prioceiling, old_ceiling)
-     pthread_mutex_t *mutex;
-     int prioceiling;
-     int *old_ceiling;
+pthread_mutex_setprioceiling (pthread_mutex_t *mutex, int prioceiling,
+			      int *old_ceiling)
 {
   /* The low bits of __kind aren't ever changed after pthread_mutex_init,
      so we don't need a lock yet.  */
diff --git a/nptl/pthread_mutexattr_getprioceiling.c b/nptl/pthread_mutexattr_getprioceiling.c
index 2f73ea276c..7d52f7e68a 100644
--- a/nptl/pthread_mutexattr_getprioceiling.c
+++ b/nptl/pthread_mutexattr_getprioceiling.c
@@ -22,9 +22,8 @@
 
 
 int
-pthread_mutexattr_getprioceiling (attr, prioceiling)
-     const pthread_mutexattr_t *attr;
-     int *prioceiling;
+pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *attr,
+				  int *prioceiling)
 {
   const struct pthread_mutexattr *iattr;
   int ceiling;
diff --git a/nptl/pthread_rwlock_init.c b/nptl/pthread_rwlock_init.c
index 99ab5e35cb..7483e5ec4c 100644
--- a/nptl/pthread_rwlock_init.c
+++ b/nptl/pthread_rwlock_init.c
@@ -29,9 +29,8 @@ static const struct pthread_rwlockattr default_rwlockattr =
 
 
 int
-__pthread_rwlock_init (rwlock, attr)
-     pthread_rwlock_t *rwlock;
-     const pthread_rwlockattr_t *attr;
+__pthread_rwlock_init (pthread_rwlock_t *rwlock,
+		       const pthread_rwlockattr_t *attr)
 {
   const struct pthread_rwlockattr *iattr;
 
diff --git a/nptl/pthread_rwlock_timedrdlock.c b/nptl/pthread_rwlock_timedrdlock.c
index 93d235e9e1..8ef124917e 100644
--- a/nptl/pthread_rwlock_timedrdlock.c
+++ b/nptl/pthread_rwlock_timedrdlock.c
@@ -28,9 +28,8 @@
 
 /* Try to acquire read lock for RWLOCK or return after specfied time.  */
 int
-pthread_rwlock_timedrdlock (rwlock, abstime)
-     pthread_rwlock_t *rwlock;
-     const struct timespec *abstime;
+pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock,
+			    const struct timespec *abstime)
 {
   int result = 0;
   bool wake = false;
diff --git a/nptl/pthread_rwlock_timedwrlock.c b/nptl/pthread_rwlock_timedwrlock.c
index 615623a75d..5ae6f6a53a 100644
--- a/nptl/pthread_rwlock_timedwrlock.c
+++ b/nptl/pthread_rwlock_timedwrlock.c
@@ -28,9 +28,8 @@
 
 /* Try to acquire write lock for RWLOCK or return after specfied time.	*/
 int
-pthread_rwlock_timedwrlock (rwlock, abstime)
-     pthread_rwlock_t *rwlock;
-     const struct timespec *abstime;
+pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock,
+			    const struct timespec *abstime)
 {
   int result = 0;
   bool wake_readers = false;
diff --git a/nptl/pthread_setschedparam.c b/nptl/pthread_setschedparam.c
index 41a629df93..c52184fbd9 100644
--- a/nptl/pthread_setschedparam.c
+++ b/nptl/pthread_setschedparam.c
@@ -24,10 +24,8 @@
 
 
 int
-__pthread_setschedparam (threadid, policy, param)
-     pthread_t threadid;
-     int policy;
-     const struct sched_param *param;
+__pthread_setschedparam (pthread_t threadid, int policy,
+			 const struct sched_param *param)
 {
   struct pthread *pd = (struct pthread *) threadid;