diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/bits/libc-tsd.h | 4 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/bits/libc-tsd.h | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sysdeps/generic/bits/libc-tsd.h b/sysdeps/generic/bits/libc-tsd.h index 3c77e1519f..ce25601986 100644 --- a/sysdeps/generic/bits/libc-tsd.h +++ b/sysdeps/generic/bits/libc-tsd.h @@ -28,6 +28,8 @@ keys used in only one source file, empty for global definitions, or `extern' for global declarations. + __libc_tsd_address(KEY) -- Return the `void **' pointing to + the current thread's datum for KEY. __libc_tsd_get(KEY) -- Return the `void *' datum for KEY. __libc_tsd_set(KEY, VALUE) -- Set the datum for KEY to VALUE. @@ -52,11 +54,13 @@ #if USE_TLS && HAVE___THREAD # define __libc_tsd_define(CLASS, KEY) CLASS __thread void *__libc_tsd_##KEY; +# define __libc_tsd_address(KEY) (&__libc_tsd_##KEY) # define __libc_tsd_get(KEY) (__libc_tsd_##KEY) # define __libc_tsd_set(KEY, VALUE) (__libc_tsd_##KEY = (VALUE)) #else # define __libc_tsd_define(CLASS, KEY) CLASS void *__libc_tsd_##KEY##_data; +# define __libc_tsd_address(KEY) (&__libc_tsd_##KEY) # define __libc_tsd_get(KEY) (__libc_tsd_##KEY##_data) # define __libc_tsd_set(KEY, VALUE) (__libc_tsd_##KEY##_data = (VALUE)) #endif diff --git a/sysdeps/mach/hurd/bits/libc-tsd.h b/sysdeps/mach/hurd/bits/libc-tsd.h index 1dbdbb17b9..56393e930d 100644 --- a/sysdeps/mach/hurd/bits/libc-tsd.h +++ b/sysdeps/mach/hurd/bits/libc-tsd.h @@ -1,5 +1,5 @@ /* libc-internal interface for thread-specific data. Hurd version. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -24,14 +24,11 @@ #define __libc_tsd_define(CLASS, KEY) /* nothing, always have threadvars */ -#define __libc_tsd_threadvar_location(KEY) \ +#define __libc_tsd_address(KEY) \ ((void **) __hurd_threadvar_location (_HURD_THREADVAR_##KEY)) -#define __libc_tsd_get(KEY) \ - (*__libc_tsd_threadvar_location (KEY)) - -#define __libc_tsd_set(KEY, VALUE) \ - (*__libc_tsd_threadvar_location (KEY) = (VALUE)) +#define __libc_tsd_get(KEY) (*__libc_tsd_address (KEY)) +#define __libc_tsd_set(KEY, VALUE) (*__libc_tsd_address (KEY) = (VALUE)) #endif /* bits/libc-tsd.h */ |