summaryrefslogtreecommitdiff
path: root/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-tsd.h
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-01-06 00:56:35 +0000
committerMike Frysinger <vapier@gentoo.org>2006-01-06 00:56:35 +0000
commit37cafa773b0bbebc9aa820f92ef5949a71d2dfe4 (patch)
tree5c415fc421104b42e74aea13abe10db0ffbfdef5 /libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-tsd.h
parentea35ab7829ae1aaae2b24408a7281ee94ce90478 (diff)
update libc lock functions to new pthread forwarding
Diffstat (limited to 'libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-tsd.h')
-rw-r--r--libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-tsd.h6
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, \