diff options
| author | Roland McGrath <roland@gnu.org> | 2002-09-02 07:09:08 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-09-02 07:09:08 +0000 |
| commit | cf684340ce723e2ec50e8f82d8c10947360518d2 (patch) | |
| tree | 123ff19d7fbfabf234aee0e62a0753eba16827ea /sysdeps | |
| parent | 4032add80a847ddff3dff9d85163fc119013b9e2 (diff) | |
| download | glibc-cf684340ce723e2ec50e8f82d8c10947360518d2.tar glibc-cf684340ce723e2ec50e8f82d8c10947360518d2.tar.gz glibc-cf684340ce723e2ec50e8f82d8c10947360518d2.tar.bz2 glibc-cf684340ce723e2ec50e8f82d8c10947360518d2.zip | |
* ctype/ctype.h (__ctype_b, __ctype_toupper, __ctype_tolower):
Variable declarations removed.
(__ctype_b_loc, __ctype_toupper_loc, __ctype_tolower_loc): Declare
these functions to replace them.
(__isctype, tolower, toupper, _tolower, _toupper): Use those accessor
functions plus an indirection rather than the old global variables.
* include/ctype.h (__isctype, tolower, _tolower, toupper, _toupper):
Macros removed.
(__ctype_b_loc, __ctype_toupper_loc, __ctype_tolower_loc): New extern
inline functions.
* ctype/ctype-info.c: Revert last reversion back the other way.
Define tsd vars CTYPE_B, CTYPE_TOLOWER, CTYPE_TOUPPER.
Define real function versions of include/ctype.h inlines here.
* ctype/Versions (libc: GLIBC_2.3): Add __ctype_b_loc,
__ctype_tolower_loc, __ctype_toupper_loc.
* locale/lc-ctype.c: Revert last reversion back the other way.
(_nl_postload_ctype): If current thread uses the global locale,
update its tsd vars.
* locale/uselocale.c (__uselocale): Update tsd vars from new locale.
* hurd/hurd/threadvar.h (enum __hurd_threadvar_index): Add CTYPE_B,
CTYPE_TOLOWER, CTYPE_TOUPPER.
* sysdeps/generic/bits/libc-tsd.h (__libc_tsd_address): New macro.
* sysdeps/mach/hurd/bits/libc-tsd.h (__libc_tsd_address): Renamed
from __libc_tsd_threadvar_location.
(__libc_tsd_set, __libc_tsd_get): Update uses.
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 */ |