mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-11 07:40:05 +00:00
cf684340ce
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.
66 lines
3.1 KiB
C
66 lines
3.1 KiB
C
/* Copyright (C) 1991,92,95,96,97,99,2000,02 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
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#define CTYPE_EXTERN_INLINE /* Define real functions for accessors. */
|
|
#include <ctype.h>
|
|
#include <locale/localeinfo.h>
|
|
|
|
__libc_tsd_define (, CTYPE_B)
|
|
__libc_tsd_define (, CTYPE_TOLOWER)
|
|
__libc_tsd_define (, CTYPE_TOUPPER)
|
|
|
|
|
|
#include <shlib-compat.h>
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3)
|
|
|
|
/* Defined in locale/C-ctype.c. */
|
|
extern const char _nl_C_LC_CTYPE_class[] attribute_hidden;
|
|
extern const char _nl_C_LC_CTYPE_class32[] attribute_hidden;
|
|
extern const char _nl_C_LC_CTYPE_toupper[] attribute_hidden;
|
|
extern const char _nl_C_LC_CTYPE_tolower[] attribute_hidden;
|
|
extern const char _nl_C_LC_CTYPE_class_upper[] attribute_hidden;
|
|
extern const char _nl_C_LC_CTYPE_class_lower[] attribute_hidden;
|
|
extern const char _nl_C_LC_CTYPE_class_alpha[] attribute_hidden;
|
|
extern const char _nl_C_LC_CTYPE_class_digit[] attribute_hidden;
|
|
extern const char _nl_C_LC_CTYPE_class_xdigit[] attribute_hidden;
|
|
extern const char _nl_C_LC_CTYPE_class_space[] attribute_hidden;
|
|
extern const char _nl_C_LC_CTYPE_class_print[] attribute_hidden;
|
|
extern const char _nl_C_LC_CTYPE_class_graph[] attribute_hidden;
|
|
extern const char _nl_C_LC_CTYPE_class_blank[] attribute_hidden;
|
|
extern const char _nl_C_LC_CTYPE_class_cntrl[] attribute_hidden;
|
|
extern const char _nl_C_LC_CTYPE_class_punct[] attribute_hidden;
|
|
extern const char _nl_C_LC_CTYPE_class_alnum[] attribute_hidden;
|
|
|
|
#define b(t,x,o) (((const t *) _nl_C_LC_CTYPE_##x) + o)
|
|
|
|
const unsigned short int *__ctype_old_b = b (unsigned short int, class, 128);
|
|
const __uint32_t *__ctype32_old_b = b (__uint32_t, class32, 0);
|
|
const __int32_t *__ctype_old_tolower = b (__int32_t, tolower, 128);
|
|
const __int32_t *__ctype_old_toupper = b (__int32_t, toupper, 128);
|
|
const __uint32_t *__ctype32_old_tolower = b (__uint32_t, tolower, 128);
|
|
const __uint32_t *__ctype32_old_toupper = b (__uint32_t, toupper, 128);
|
|
|
|
compat_symbol (libc, __ctype_old_b, __ctype_b, GLIBC_2_0);
|
|
compat_symbol (libc, __ctype_old_tolower, __ctype_tolower, GLIBC_2_0);
|
|
compat_symbol (libc, __ctype_old_toupper, __ctype_toupper, GLIBC_2_0);
|
|
compat_symbol (libc, __ctype32_old_b, __ctype32_b, GLIBC_2_0);
|
|
compat_symbol (libc, __ctype32_old_tolower, __ctype32_tolower, GLIBC_2_2);
|
|
compat_symbol (libc, __ctype32_old_toupper, __ctype32_toupper, GLIBC_2_2);
|
|
|
|
#endif
|