diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-11-12 20:29:35 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2008-11-12 20:29:35 +0000 |
| commit | 03c8e287448a12c8c4c6db3570f5b7e3930d488d (patch) | |
| tree | 6227d4a8b3362cade23f1a5bdf6065c4e4a415ec /locale/global-locale.c | |
| parent | c02fa54041a68c12107ec577770ff81329af3bef (diff) | |
Updated to fedora-glibc-20081112T2008cvs/fedora-glibc-2_8_90-17
Diffstat (limited to 'locale/global-locale.c')
| -rw-r--r-- | locale/global-locale.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/locale/global-locale.c b/locale/global-locale.c index 2280f68df4..771742e1be 100644 --- a/locale/global-locale.c +++ b/locale/global-locale.c @@ -1,5 +1,5 @@ /* Locale object representing the global locale controlled by setlocale. - Copyright (C) 2002, 2006 Free Software Foundation, Inc. + 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 @@ -62,9 +62,9 @@ struct __locale_struct _nl_global_locale attribute_hidden = #include <tls.h> #if HAVE___THREAD /* The tsd macros don't permit an initializer. */ -__thread void *__libc_tsd_LOCALE = &_nl_global_locale; +__thread __locale_t __libc_tsd_LOCALE = &_nl_global_locale; #else -__libc_tsd_define (, LOCALE) +__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 |