diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-23 18:00:21 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-23 18:00:21 +0000 |
| commit | 71dcdb6d0189761ecc27691932502eacdf7e6b2c (patch) | |
| tree | e43907895b457d875f314ad26d153445c1071622 | |
| parent | ccebcf4e6d0b42681cc78edbfd2d2adec674f7c7 (diff) | |
Rename __pthread_initialize into __pthread_init
The former conflicts with usage in glibc.
* pthread/pt-initialize.c (__pthread_initialize): Rename into
__pthread_init.
* pthread/pt-internal.h (__pthread_initialize): Likewise.
* sysdeps/l4/hurd/pt-sysdep.c (init_routine): Likewise.
* sysdeps/mach/hurd/pt-sysdep.c (init_routine): Likewise.
| -rw-r--r-- | pthread/pt-initialize.c | 2 | ||||
| -rw-r--r-- | pthread/pt-internal.h | 2 | ||||
| -rw-r--r-- | sysdeps/l4/hurd/pt-sysdep.c | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/pt-sysdep.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pthread/pt-initialize.c b/pthread/pt-initialize.c index f0ef8f8..39f1aed 100644 --- a/pthread/pt-initialize.c +++ b/pthread/pt-initialize.c @@ -74,7 +74,7 @@ static const struct pthread_functions pthread_functions = /* Initialize the pthreads library. */ void -__pthread_initialize (void) +__pthread_init (void) { #ifdef IS_IN_libpthread __libc_pthread_init(ptr_pthread_functions); diff --git a/pthread/pt-internal.h b/pthread/pt-internal.h index a1e90aa..a1da377 100644 --- a/pthread/pt-internal.h +++ b/pthread/pt-internal.h @@ -188,7 +188,7 @@ extern struct __pthread *_pthread_self (void); /* Initialize the pthreads library. */ -extern void __pthread_initialize (void); +extern void __pthread_init (void); /* Internal version of pthread_create. Rather than return the new tid, we return the whole __pthread structure in *PTHREAD. */ diff --git a/sysdeps/l4/hurd/pt-sysdep.c b/sysdeps/l4/hurd/pt-sysdep.c index c23364c..1df6c2e 100644 --- a/sysdeps/l4/hurd/pt-sysdep.c +++ b/sysdeps/l4/hurd/pt-sysdep.c @@ -45,7 +45,7 @@ static void init_routine (void (*entry) (void *), void *arg) { /* Initialize the library. */ - __pthread_initialize (); + __pthread_init(); struct __pthread *thread; int err; diff --git a/sysdeps/mach/hurd/pt-sysdep.c b/sysdeps/mach/hurd/pt-sysdep.c index 5e07006..95a4d36 100644 --- a/sysdeps/mach/hurd/pt-sysdep.c +++ b/sysdeps/mach/hurd/pt-sysdep.c @@ -45,7 +45,7 @@ init_routine (void) int err; /* Initialize the library. */ - __pthread_initialize (); + __pthread_init (); /* Create the pthread structure for the main thread (i.e. us). */ err = __pthread_create_internal (&thread, 0, 0, 0); |