diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2012-06-05 02:09:04 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2012-06-05 02:09:04 +0400 |
| commit | 415ee7d6e47dcb3e0906a7bebc6d52ab8ed899da (patch) | |
| tree | f7773ad82023c8616b339d84faa4bb7643af0311 /nptl/pthread_join.c | |
| parent | 3cc0cd4c5b3bed6f7d9aff26322d505785e11aa9 (diff) | |
| download | glibc-415ee7d6e47dcb3e0906a7bebc6d52ab8ed899da.tar.gz | |
Merged changes from kopensolaris-gnu project
http://git.csclub.uwaterloo.ca/?p=kopensolaris-gnu/glibc.git
Commits from 9157319 to bad8ac8.
This is only partial patch, some changes to not apply
and will be resovled and committed next.
Diffstat (limited to 'nptl/pthread_join.c')
| -rw-r--r-- | nptl/pthread_join.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nptl/pthread_join.c b/nptl/pthread_join.c index bf1a01dbc9..fc2ab2875f 100644 --- a/nptl/pthread_join.c +++ b/nptl/pthread_join.c @@ -20,7 +20,7 @@ #include <stdlib.h> #include <atomic.h> -#include "pthreadP.h" +#include <pthreadP.h> #include <stap-probe.h> @@ -41,7 +41,11 @@ pthread_join (threadid, thread_return) pthread_t threadid; void **thread_return; { +#ifndef PTHREAD_T_IS_TID struct pthread *pd = (struct pthread *) threadid; +#else + struct pthread *pd = __find_in_stack_list (threadid); +#endif /* Make sure the descriptor is valid. */ if (INVALID_NOT_TERMINATED_TD_P (pd)) |