diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-02-12 23:32:44 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-02-12 23:32:44 +0100 |
| commit | 9dd3e61fcc58a31991ce775a7c78383aa4419cee (patch) | |
| tree | e8a4a22b5ffec09be20de9684bc0dcc8939695ca | |
| parent | 44ae774bed1a75ea926590f1bc7c9f3328219832 (diff) | |
Rename __pthread_init into ___pthread_init
To avoid clashing with the __pthread_init hook.
* pthread/pt-initialize.c (__pthread_init): Rename into ___pthread_init.
* pthread/pt-internal.h: Likewise.
* sysdeps/mach/hurd/pt-sysdep.c: Likewise.
| -rw-r--r-- | pthread/pt-initialize.c | 2 | ||||
| -rw-r--r-- | pthread/pt-internal.h | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/pt-sysdep.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pthread/pt-initialize.c b/pthread/pt-initialize.c index fc4e137..a99cc59 100644 --- a/pthread/pt-initialize.c +++ b/pthread/pt-initialize.c @@ -69,7 +69,7 @@ static const struct pthread_functions pthread_functions = /* Initialize the pthreads library. */ void -__pthread_init (void) +___pthread_init (void) { #if IS_IN (libpthread) __libc_pthread_init(&pthread_functions); diff --git a/pthread/pt-internal.h b/pthread/pt-internal.h index fb9267e..84964bf 100644 --- a/pthread/pt-internal.h +++ b/pthread/pt-internal.h @@ -205,7 +205,7 @@ extern struct __pthread *_pthread_self (void); /* Initialize the pthreads library. */ -extern void __pthread_init (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/mach/hurd/pt-sysdep.c b/sysdeps/mach/hurd/pt-sysdep.c index 038d614..8d40185 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_init (); + ___pthread_init (); /* Create the pthread structure for the main thread (i.e. us). */ err = __pthread_create_internal (&thread, 0, 0, 0); |