From: Roland McGrath Date: Tue, 20 Aug 2002 22:01:26 +0000 (+0000) Subject: 2002-05-21 Ulrich Drepper X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4235bf255b7c99e55e0c63cc86ef7862d0e5e61;p=thirdparty%2Fglibc.git 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. --- diff --git a/linuxthreads/internals.h b/linuxthreads/internals.h index 2159e70b772..c72ab8ce86c 100644 --- a/linuxthreads/internals.h +++ b/linuxthreads/internals.h @@ -554,7 +554,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 08a338b9a83..bc399185e10 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 b86e75f20ef..df2bcac291d 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 */