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_self.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_self.c')
| -rw-r--r-- | nptl/pthread_self.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nptl/pthread_self.c b/nptl/pthread_self.c index c94267d31f..3c597beac5 100644 --- a/nptl/pthread_self.c +++ b/nptl/pthread_self.c @@ -16,13 +16,17 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include "pthreadP.h" +#include <pthreadP.h> #include <tls.h> pthread_t __pthread_self (void) { +#ifndef PTHREAD_T_IS_TID return (pthread_t) THREAD_SELF; +#else + return THREAD_GETMEM (THREAD_SELF, tid); +#endif } strong_alias (__pthread_self, pthread_self) |