diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-27 01:28:16 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-27 01:28:16 +0000 |
| commit | e84c82a43e671c7506401936ac097b55d0fb47bf (patch) | |
| tree | 38b3e3110a06e1e5a82aaf545e091cfc58f77021 | |
| parent | 71dcdb6d0189761ecc27691932502eacdf7e6b2c (diff) | |
Always pass the pthread_functions structure
* pthread/pt-initialize.c (pthread_functions): Always define.
(__pthread_init): Always pass address of pthread_functions.
| -rw-r--r-- | pthread/pt-initialize.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pthread/pt-initialize.c b/pthread/pt-initialize.c index 39f1aed..831a63d 100644 --- a/pthread/pt-initialize.c +++ b/pthread/pt-initialize.c @@ -29,7 +29,6 @@ DEFINE_HOOK (__pthread_init, (void)); #ifdef IS_IN_libpthread -#ifdef SHARED static const struct pthread_functions pthread_functions = { .ptr_pthread_attr_destroy = __pthread_attr_destroy, @@ -66,10 +65,6 @@ static const struct pthread_functions pthread_functions = .ptr_pthread_setcanceltype = __pthread_setcanceltype, .ptr___pthread_get_cleanup_stack = __pthread_get_cleanup_stack, }; -# define ptr_pthread_functions &pthread_functions -#else -# define ptr_pthread_functions NULL -#endif #endif /* IS_IN_libpthread */ /* Initialize the pthreads library. */ @@ -77,7 +72,7 @@ void __pthread_init (void) { #ifdef IS_IN_libpthread - __libc_pthread_init(ptr_pthread_functions); + __libc_pthread_init(&pthread_functions); #endif RUN_HOOK (__pthread_init, ()); } |