0f283ffc5e
TLS_INIT_TCB_SIZE, TLS_INIT_TCB_ALIGN instead of 0, 1. * include/getopt.h: Include <features.h> before <posix/getopt.h>. * locale/findlocale.c (_nl_remove_locale): Don't search in _nl_locale_file_list if DATA->alloc is ld_archive. Use _nl_unload_locale to do the rest of the work. * locale/loadarchive.c (_nl_load_locale_from_archive): Set usage_count of new structure to UNDELETABLE. * wctype/wctype.h (iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph, iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank, towlower, towupper): Macros removed. * ctype/ctype.h (__tobody): Put parens around macro argument. (__isctype): Macro removed. (__ctype_b, __ctype_tolower, __ctype_toupper): Decls removed. (isalnum, isalpha, iscntrl, isdigit, islower, isgraph, isprint, ispunct, isspace, isupper, isxdigit, isblank, _tolower, _toupper, tolower, toupper): Macros and inlines removed. * include/ctype.h [! NOT_IN_libc] (isalnum, isalpha, iscntrl, isdigit, islower, isgraph, isprint, ispunct, isspace, isupper, isxdigit, isblank, _tolower, _toupper, tolower, toupper): Define here instead, using _NL_CURRENT. * ctype/ctype.c (__ctype_tolower, __ctype_toupper): Define as macros using _NL_CURRENT. * ctype/ctype-extn.c (__ctype_tolower, __ctype_toupper): Likewise. * ctype/ctype-info.c (__ctype_b, __ctype_tolower, __ctype_toupper): Renamed these to __ctype_old_*. Define old names only for SHLIB_COMPAT. (__ctype32_b, __ctype32_tolower, __ctype32_toupper): Likewise. (__ctype32_wctrans, __ctype32_wctrans, __ctype32_width): Removed. * locale/lc-ctype.c (_nl_postload_ctype): Use renamed variables, conditional on SHLIB_COMPAT. Don't set removed variables at all. * wctype/wcfuncs.c: Use _NL_CURRENT instead of those globals. * wcsmbs/wcwidth.h (internal_wcwidth): Likewise. * resolv/res_init.c [RESOLVSORT] (sort_mask): Renamed sort_mask_chars. (ISSORTMASK): Update use. * intl/localealias.c [__GNUC__]: #undef alloca before #define. * nss/nss_files/files-XXX.c (last_use): Rename `none' to `nouse'. (_nss_files_getENTNAME_r): Likewise. * nss/nss_files/files-alias.c (last_use, _nss_files_getaliasent_r): Likewise. * Makerules (all-nonlib): Renamed from all-tests. Include $(others) here too. * locale/Makefile (CPPFLAGS-locale, CPPFLAGS-localedef, CPPFLAGS-ld-ctype, CPPFLAGS-ld-time, CPPFLAGS-ld-numeric, CPPFLAGS-ld-monetary, CPPFLAGS-ld-collate, CPPFLAGS-ld-identification, CPPFLAGS-charmap, CPPFLAGS-locarchive, CPPFLAGS-linereader, CPPFLAGS-charmap-dir): Variables removed. Instead, catch all the program modules via cppflags-iterator.mk. * sunrpc/Makefile (CPPFLAGS-rpc_main): Variable removed. Instead, catch all rpcgen-objs via cppflags-iterator.mk. * posix/tst-getconf.sh: If no third arg, work with static linking.
60 lines
2.9 KiB
C
60 lines
2.9 KiB
C
/* Copyright (C) 1991,92,95,96,97,99,2000,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
|
|
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. */
|
|
|
|
#include <shlib-compat.h>
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3)
|
|
|
|
#include <ctype.h>
|
|
#include <locale/localeinfo.h>
|
|
|
|
/* 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
|