From 3ce1f2959437e952b9db4eaeed2407424f11a4d1 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 10 Sep 2011 14:34:15 -0400 Subject: Cleanup of configuration options Make several tool features mandatory and simplify the code. --- locale/global-locale.c | 14 ++------------ locale/localeinfo.h | 4 ++-- 2 files changed, 4 insertions(+), 14 deletions(-) (limited to 'locale') diff --git a/locale/global-locale.c b/locale/global-locale.c index 63d1238..c5681a7 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, 2008, 2010 Free Software Foundation, Inc. + Copyright (C) 2002, 2006, 2008, 2010, 2011 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,16 +60,6 @@ struct __locale_struct _nl_global_locale attribute_hidden = }; #include -#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 diff --git a/locale/localeinfo.h b/locale/localeinfo.h index 72e9d3a..6cf05b2 100644 --- a/locale/localeinfo.h +++ b/locale/localeinfo.h @@ -1,5 +1,5 @@ /* Declarations for internal libc locale interfaces - Copyright (C) 1995-2003, 2005, 2006, 2007, 2008, 2009, 2010 + Copyright (C) 1995-2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -216,7 +216,7 @@ __libc_tsd_define (extern, __locale_t, LOCALE) unused. We can manage this playing some tricks with weak references. But with thread-local locale settings, it becomes quite ungainly unless we can use __thread variables. So only in that case do we attempt this. */ -#if !defined SHARED && defined HAVE___THREAD && defined HAVE_WEAK_SYMBOLS +#if !defined SHARED && defined HAVE_WEAK_SYMBOLS # include # define NL_CURRENT_INDIRECT 1 #endif -- cgit v1.1