diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-01-06 03:28:21 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-01-06 03:28:21 +0000 |
| commit | 0eb5948fa79555941ede961f34271eeff5d35e81 (patch) | |
| tree | 099a64064074ee94dad4017edceb682b93950ed7 /libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-tsd.h | |
| parent | fc5b85426bc76b2bfc1a3fe4d9e8d543ceba12b5 (diff) | |
| download | uClibc-alpine-0eb5948fa79555941ede961f34271eeff5d35e81.tar.bz2 uClibc-alpine-0eb5948fa79555941ede961f34271eeff5d35e81.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-tsd.h')
| -rw-r--r-- | libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-tsd.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-tsd.h b/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-tsd.h index fc8388ab8..ce56ea30d 100644 --- a/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-tsd.h +++ b/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-tsd.h @@ -44,6 +44,8 @@ enum __libc_tsd_key_t { _LIBC_TSD_KEY_MALLOC = 0, #else +# include <bits/libc-lock.h> + # ifndef SHARED extern void ** __pthread_internal_tsd_address (int); extern void *__pthread_internal_tsd_get (int); @@ -54,10 +56,6 @@ weak_extern (__pthread_internal_tsd_get) weak_extern (__pthread_internal_tsd_set) # endif -#define __libc_maybe_call2(FUNC, ARGS, ELSE) \ - ({__builtin_expect (__libc_pthread_functions.ptr_##FUNC != NULL, 0) \ - ? __libc_pthread_functions.ptr_##FUNC ARGS : ELSE; }) - #define __libc_tsd_define(CLASS, KEY) CLASS void *__libc_tsd_##KEY##_data; #define __libc_tsd_address(KEY) \ __libc_maybe_call2 (pthread_internal_tsd_address, \ |