diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-09-21 00:05:53 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-09-21 00:05:53 +0200 |
| commit | 1f32bdc2e2f54cf4279b720909ff9c2d64a1c406 (patch) | |
| tree | 03761c564ebe347a2924667ac4b4d4fabbb58dfe /pthread/pt-join.c | |
| parent | a9d69ae8ab389dc9f47aef519dac4f422b4120ef (diff) | |
| parent | 1d49ccdd73c182ad9f280d21d5a5e88bd59db871 (diff) | |
Merge branch 'master' into master-glibc-2.23
Diffstat (limited to 'pthread/pt-join.c')
| -rw-r--r-- | pthread/pt-join.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pthread/pt-join.c b/pthread/pt-join.c index 122d130..9730afc 100644 --- a/pthread/pt-join.c +++ b/pthread/pt-join.c @@ -43,7 +43,7 @@ pthread_join (pthread_t thread, void **status) /* Rely on pthread_cond_wait being a cancellation point to make pthread_join one too. */ while (pthread->state == PTHREAD_JOINABLE) - pthread_cond_wait (&pthread->state_cond, &pthread->state_lock); + __pthread_cond_wait (&pthread->state_cond, &pthread->state_lock); pthread_cleanup_pop (0); |