* config/locale/gnu/messages_members.h: Add __uselocale bits.
* config/locale/gnu/messages_members.cc: Same.
* config/locale/gnu/time_members.cc: Same.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@51217
138bc75d-0d04-0410-961f-
82ee72b054a4
2002-03-22 Benjamin Kosnik <bkoz@redhat.com>
+
+ * config/locale/gnu/messages_members.h: Add __uselocale bits.
+ * config/locale/gnu/messages_members.cc: Same.
+ * config/locale/gnu/time_members.cc: Same.
+
+2002-03-22 Benjamin Kosnik <bkoz@redhat.com>
* src/vterminate.cc: Format, -fno-exceptions cleanup.
string
messages<char>::do_get(catalog, int, int, const string& __dfault) const
{
-#if 0
- // Requires glibc 2.3
- __c_locale __old = uselocale(_M_c_locale_messages);
+#if __GLIBC__ >= 2 && __GLIBC_MINOR__ > 2
+ __c_locale __old = __uselocale(_M_c_locale_messages);
const char* __msg = const_cast<const char*>(gettext(__dfault.c_str()));
- uselocale(__old);
+ __uselocale(__old);
return string(__msg);
#else
const char* __old = setlocale(LC_ALL, _M_name_messages);
messages<_CharT>::do_get(catalog, int, int,
const string_type& __dfault) const
{
-#if 0
- // Requires glibc 2.3
- __c_locale __old = uselocale(_M_c_locale_messages);
+#if __GLIBC__ >= 2 && __GLIBC_MINOR__ > 2
+ __c_locale __old = __uselocale(_M_c_locale_messages);
char* __msg = gettext(_M_convert_to_char(__dfault));
- uselocale(__old);
+ __uselocale(__old);
return _M_convert_from_char(__msg);
#else
const char* __old = setlocale(LC_ALL, _M_name_messages);
_M_put_helper(char* __s, size_t __maxlen, const char* __format,
const tm* __tm) const
{
-#if 0
- // Requires glibc 2.3
+#if __GLIBC__ >= 2 && __GLIBC_MINOR__ > 2
if (_M_c_locale_timepunct)
__strftime_l(__s, __maxlen, _M_c_locale_timepunct, __format, __tm);
else
_M_put_helper(wchar_t* __s, size_t __maxlen, const wchar_t* __format,
const tm* __tm) const
{
-#if 0
- // Requires glibc 2.3
+#if __GLIBC__ >= 2 && __GLIBC_MINOR__ > 2
if (_M_c_locale_timepunct)
__wcsftime_l(__s, __maxlen, _M_c_locale_timepunct, __format, __tm);
else