2002-03-25 Benjamin Kosnik <bkoz@redhat.com>

            Jakub Jelinek  <jakub@redhat.com>

	* config/locale/gnu/messages_members.h: Correct conditional.
	* 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@51332 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8f5ce9e..43c80a2 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-25  Benjamin Kosnik  <bkoz@redhat.com>
+            Jakub Jelinek  <jakub@redhat.com>
+       
+       * config/locale/gnu/messages_members.h: Correct conditional.
+       * config/locale/gnu/messages_members.cc: Same.
+       * config/locale/gnu/time_members.cc: Same.
+       
 2002-03-25  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
             Paolo Carlini  <pcarlini@unitus.it>
 
@@ -95,7 +102,7 @@
        * configure.in:  Add comments pointing the way for autoconf 2.5x.
        * aclocal.m4, config.h.in, configure:  Regenerate.
 
-2002-03-15  Philipp Thomas  <pthomas@suse.de>
+2002-03-18  Philipp Thomas  <pthomas@suse.de>
 
        * include/backward/hash_map.h: hash, hashtable, hash_map and
        hash_multimap are in namespace __gnu_cxx.

diff --git a/libstdc++-v3/config/locale/gnu/messages_members.cc b/libstdc++-v3/config/locale/gnu/messages_members.cc
index 326bee7..28702c2 100644 (file)
--- a/libstdc++-v3/config/locale/gnu/messages_members.cc
+++ b/libstdc++-v3/config/locale/gnu/messages_members.cc
@@ -42,7 +42,7 @@ namespace std
     string
     messages<char>::do_get(catalog, int, int, const string& __dfault) const
     {
-#if __GLIBC__ >= 2 && __GLIBC_MINOR__ > 2
+#if __GLIBC__ > 2 || (__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);

diff --git a/libstdc++-v3/config/locale/gnu/messages_members.h b/libstdc++-v3/config/locale/gnu/messages_members.h
index ef59fd5..d664d39 100644 (file)
--- a/libstdc++-v3/config/locale/gnu/messages_members.h
+++ b/libstdc++-v3/config/locale/gnu/messages_members.h
@@ -59,7 +59,7 @@
     messages<_CharT>::do_get(catalog, int, int, 
                             const string_type& __dfault) const
     { 
-#if __GLIBC__ >= 2 && __GLIBC_MINOR__ > 2
+#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
       __c_locale __old = __uselocale(_M_c_locale_messages);
       char* __msg = gettext(_M_convert_to_char(__dfault));
       __uselocale(__old);

diff --git a/libstdc++-v3/config/locale/gnu/time_members.cc b/libstdc++-v3/config/locale/gnu/time_members.cc
index 8f7665e..124a917 100644 (file)
--- a/libstdc++-v3/config/locale/gnu/time_members.cc
+++ b/libstdc++-v3/config/locale/gnu/time_members.cc
@@ -44,7 +44,7 @@ namespace std
     _M_put_helper(char* __s, size_t __maxlen, const char* __format, 
                  const tm* __tm) const
     {
-#if __GLIBC__ >= 2 && __GLIBC_MINOR__ > 2
+#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
       if (_M_c_locale_timepunct)
        __strftime_l(__s, __maxlen, _M_c_locale_timepunct, __format, __tm);
       else
@@ -188,7 +188,7 @@ namespace std
     _M_put_helper(wchar_t* __s, size_t __maxlen, const wchar_t* __format, 
                  const tm* __tm) const
     {
-#if __GLIBC__ >= 2 && __GLIBC_MINOR__ > 2
+#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
       if (_M_c_locale_timepunct)
        __wcsftime_l(__s, __maxlen, _M_c_locale_timepunct, __format, __tm);
       else