diff options
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/global-locale.c | 4 | ||||
| -rw-r--r-- | locale/localeinfo.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/locale/global-locale.c b/locale/global-locale.c index a5cae3c5d1..2280f68df4 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 Free Software Foundation, Inc. + Copyright (C) 2002, 2006 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 @@ -60,7 +60,7 @@ struct __locale_struct _nl_global_locale attribute_hidden = }; #include <tls.h> -#if USE_TLS && HAVE___THREAD +#if HAVE___THREAD /* The tsd macros don't permit an initializer. */ __thread void *__libc_tsd_LOCALE = &_nl_global_locale; #else diff --git a/locale/localeinfo.h b/locale/localeinfo.h index 4f746a298d..5c1f27f7e1 100644 --- a/locale/localeinfo.h +++ b/locale/localeinfo.h @@ -215,9 +215,7 @@ __libc_tsd_define (extern, LOCALE) we can use __thread variables. So only in that case do we attempt this. */ #if !defined SHARED && defined HAVE___THREAD && defined HAVE_WEAK_SYMBOLS # include <tls.h> -# if USE_TLS -# define NL_CURRENT_INDIRECT 1 -# endif +# define NL_CURRENT_INDIRECT 1 #endif #ifdef NL_CURRENT_INDIRECT |