From 12b7f470d21eeb897e25b9ef6dae4bfd787168f6 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 21 May 2002 17:58:38 +0000 Subject: [PATCH] Update. 2002-05-21 Ulrich Drepper * sysdeps/pthread/pthread.h (pthread_create): Rename first parameter. (pthread_cancel): Likewise. * internals.h (__pthread_create_2_1): Likewise. * sysdeps/unix/sysv/linux/bits/sigthread.h (pthread_kill): Likewise. --- linuxthreads/ChangeLog | 8 ++++++++ linuxthreads/internals.h | 2 +- linuxthreads/sysdeps/pthread/pthread.h | 4 ++-- linuxthreads/sysdeps/unix/sysv/linux/bits/sigthread.h | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 0ab1e1c5f2..2e65b83c65 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,11 @@ +2002-05-21 Ulrich Drepper + + * sysdeps/pthread/pthread.h (pthread_create): Rename first + parameter. + (pthread_cancel): Likewise. + * internals.h (__pthread_create_2_1): Likewise. + * sysdeps/unix/sysv/linux/bits/sigthread.h (pthread_kill): Likewise. + 2002-05-20 Ulrich Drepper * sysdeps/alpha/pt-machine.c (THREAD_SELF): Remove clobber. diff --git a/linuxthreads/internals.h b/linuxthreads/internals.h index 39c545c5e1..64fb6bb602 100644 --- a/linuxthreads/internals.h +++ b/linuxthreads/internals.h @@ -362,7 +362,7 @@ extern int __new_sem_destroy (sem_t *__sem); /* Prototypes for compatibility functions. */ extern int __pthread_attr_init_2_1 (pthread_attr_t *__attr); extern int __pthread_attr_init_2_0 (pthread_attr_t *__attr); -extern int __pthread_create_2_1 (pthread_t *__restrict __thread, +extern int __pthread_create_2_1 (pthread_t *__restrict __threadp, const pthread_attr_t *__attr, void *(*__start_routine) (void *), void *__restrict __arg); diff --git a/linuxthreads/sysdeps/pthread/pthread.h b/linuxthreads/sysdeps/pthread/pthread.h index 08a338b9a8..bc399185e1 100644 --- a/linuxthreads/sysdeps/pthread/pthread.h +++ b/linuxthreads/sysdeps/pthread/pthread.h @@ -160,7 +160,7 @@ enum /* Create a thread with given attributes ATTR (or default attributes if ATTR is NULL), and call function START_ROUTINE with given arguments ARG. */ -extern int pthread_create (pthread_t *__restrict __thread, +extern int pthread_create (pthread_t *__restrict __threadp, __const pthread_attr_t *__restrict __attr, void *(*__start_routine) (void *), void *__restrict __arg) __THROW; @@ -588,7 +588,7 @@ extern int pthread_setcancelstate (int __state, int *__oldstate) __THROW; extern int pthread_setcanceltype (int __type, int *__oldtype) __THROW; /* Cancel THREAD immediately or at the next possibility. */ -extern int pthread_cancel (pthread_t __thread) __THROW; +extern int pthread_cancel (pthread_t __cancelthread) __THROW; /* Test for pending cancellation for the current thread and terminate the thread as per pthread_exit(PTHREAD_CANCELED) if it has been diff --git a/linuxthreads/sysdeps/unix/sysv/linux/bits/sigthread.h b/linuxthreads/sysdeps/unix/sysv/linux/bits/sigthread.h index b86e75f20e..df2bcac291 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/bits/sigthread.h +++ b/linuxthreads/sysdeps/unix/sysv/linux/bits/sigthread.h @@ -1,5 +1,5 @@ /* Signal handling function for threaded programs. - Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -33,6 +33,6 @@ extern int pthread_sigmask (int __how, __sigset_t *__restrict __oldmask)__THROW; /* Send signal SIGNO to the given thread. */ -extern int pthread_kill (pthread_t __thread, int __signo) __THROW; +extern int pthread_kill (pthread_t __threadid, int __signo) __THROW; #endif /* bits/sigthread.h */