mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 00:19:57 +00:00
4b23f9bda3
__libc_tsd_get, __libc_tsd_set): Add TYPE argument, use it as the type
of the thread variable instead of void *.
* sysdeps/mach/hurd/bits/libc-tsd.h (__libc_tsd_define,
__libc_tsd_address, __libc_tsd_get, __libc_tsd_set): Likewise.
* include/ctype.h (CTYPE_B, CTYPE_TOUPPER, CTYPE_TOLOWER): Adjust
__libc_tsd_define arguments.
(__ctype_b_loc, __ctype_toupper_loc, __ctype_tolower_loc): Adjust
__libc_tsd_address arguments. Remove union hack.
* include/rpc/rpc.h (RPC_VARS): Adjust __libc_tsd_define arguments.
* sunrpc/rpc_thread.c (RPC_VARS): Likewise.
(__rpc_thread_destroy, rpc_thread_multi, __rpc_thread_variables):
Adjust __libc_tsd_{set,get} arguments.
* ctype/ctype-info.c (CTYPE_B, CTYPE_TOUPPER, CTYPE_TOLOWER): Adjust
__libc_tsd_define arguments.
* locale/uselocale.c (__uselocale): Adjust __libc_tsd_{set,get}
arguments.
* locale/lc-ctype.c (_nl_postload_ctype): Likewise.
* locale/global-locale.c (__libc_tsd_LOCALE): Adjust type.
(LOCALE): Adjust __libc_tsd_define arguments.
* locale/localeinfo.h (_NL_CURRENT_LOCALE): Adjust __libc_tsd_get
arguments.
(LOCALE): Adjust __libc_tsd_define arguments.
* sysdeps/mach/hurd/malloc-machine.h (MALLOC): Adjust __libc_tsd_define
arguments.
(tsd_setspecific, tsd_getspecific): Adjust __libc_tsd_{set,get}
arguments. nptl/
* sysdeps/pthread/malloc-machine.h (MALLOC): Adjust __libc_tsd_define
arguments.
(tsd_setspecific, tsd_getspecific): Adjust __libc_tsd_{set,get}
arguments.
2008-11-07 Jakub Jelinek <jakub@redhat.com>
* bits/libc-tsd.h (__libc_tsd_define, __libc_tsd_address,
__libc_tsd_get, __libc_tsd_set): Add TYPE argument, use it as the type
of the thread variable instead of void *.
* sysdeps/mach/hurd/bits/libc-tsd.h (__libc_tsd_define,
__libc_tsd_address, __libc_tsd_get, __libc_tsd_set): Likewise.
* include/ctype.h (CTYPE_B, CTYPE_TOUPPER, CTYPE_TOLOWER): Adjust
__libc_tsd_define arguments.
(__ctype_b_loc, __ctype_toupper_loc, __ctype_tolower_loc): Adjust
__libc_tsd_address arguments. Remove union hack.
* include/rpc/rpc.h (RPC_VARS): Adjust __libc_tsd_define arguments.
* sunrpc/rpc_thread.c (RPC_VARS): Likewise.
(__rpc_thread_destroy, rpc_thread_multi, __rpc_thread_variables):
Adjust __libc_tsd_{set,get} arguments.
* ctype/ctype-info.c (CTYPE_B, CTYPE_TOUPPER, CTYPE_TOLOWER): Adjust
__libc_tsd_define arguments.
* locale/uselocale.c (__uselocale): Adjust __libc_tsd_{set,get}
arguments.
* locale/lc-ctype.c (_nl_postload_ctype): Likewise.
* locale/global-locale.c (__libc_tsd_LOCALE): Adjust type.
(LOCALE): Adjust __libc_tsd_define arguments.
* locale/localeinfo.h (_NL_CURRENT_LOCALE): Adjust __libc_tsd_get
arguments.
(LOCALE): Adjust __libc_tsd_define arguments.
* sysdeps/mach/hurd/malloc-machine.h (MALLOC): Adjust __libc_tsd_define
arguments.
(tsd_setspecific, tsd_getspecific): Adjust __libc_tsd_{set,get}
arguments.
76 lines
2.8 KiB
C
76 lines
2.8 KiB
C
/* Locale object representing the global locale controlled by setlocale.
|
|
Copyright (C) 2002, 2006, 2008 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 <locale.h>
|
|
#include "localeinfo.h"
|
|
|
|
#define DEFINE_CATEGORY(category, category_name, items, a) \
|
|
extern struct locale_data _nl_C_##category; weak_extern (_nl_C_##category)
|
|
#include "categories.def"
|
|
#undef DEFINE_CATEGORY
|
|
|
|
/* Defined in locale/C-ctype.c. */
|
|
extern const char _nl_C_LC_CTYPE_class[] attribute_hidden;
|
|
extern const char _nl_C_LC_CTYPE_toupper[] attribute_hidden;
|
|
extern const char _nl_C_LC_CTYPE_tolower[] attribute_hidden;
|
|
weak_extern (_nl_C_LC_CTYPE_class)
|
|
weak_extern (_nl_C_LC_CTYPE_toupper)
|
|
weak_extern (_nl_C_LC_CTYPE_tolower)
|
|
|
|
/* Here we define the locale object maintained by setlocale.
|
|
The references in the initializer are weak, so the parts of
|
|
the structure that are never referred to will be zero. */
|
|
|
|
struct __locale_struct _nl_global_locale attribute_hidden =
|
|
{
|
|
.__locales =
|
|
{
|
|
#define DEFINE_CATEGORY(category, category_name, items, a) \
|
|
[category] = &_nl_C_##category,
|
|
#include "categories.def"
|
|
#undef DEFINE_CATEGORY
|
|
},
|
|
.__names =
|
|
{
|
|
[LC_ALL] = _nl_C_name,
|
|
#define DEFINE_CATEGORY(category, category_name, items, a) \
|
|
[category] = _nl_C_name,
|
|
#include "categories.def"
|
|
#undef DEFINE_CATEGORY
|
|
},
|
|
.__ctype_b = (const unsigned short int *) _nl_C_LC_CTYPE_class + 128,
|
|
.__ctype_tolower = (const int *) _nl_C_LC_CTYPE_tolower + 128,
|
|
.__ctype_toupper = (const int *) _nl_C_LC_CTYPE_toupper + 128
|
|
};
|
|
|
|
#include <tls.h>
|
|
#if HAVE___THREAD
|
|
/* The tsd macros don't permit an initializer. */
|
|
__thread __locale_t __libc_tsd_LOCALE = &_nl_global_locale;
|
|
#else
|
|
__libc_tsd_define (, __locale_t, LOCALE)
|
|
/* This is a bad kludge presuming the variable name used by the macros.
|
|
Using typeof makes sure to barf if we do not match the macro definition.
|
|
This ifndef is a further bad kludge for Hurd, where there is an explicit
|
|
initialization. */
|
|
# ifndef _HURD_THREADVAR_H
|
|
__typeof (__libc_tsd_LOCALE_data) __libc_tsd_LOCALE_data = &_nl_global_locale;
|
|
# endif
|
|
#endif
|