diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-05-25 02:33:13 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-05-25 02:33:13 +0200 |
| commit | b428baaa85c0adca9ef4884c637f289a0ab5e2d6 (patch) | |
| tree | 2b886760ce40712db7282a83dcc3957bacabd42b /pthread/pt-initialize.c | |
| parent | 1dc7553d93bf7f48b5f767b74eab607142d77160 (diff) | |
| parent | 25260994c812050a5d7addf125cdc90c911ca5c1 (diff) | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/libpthread
Diffstat (limited to 'pthread/pt-initialize.c')
| -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, ()); } |