2009-06-30 Paolo Carlini <paolo.carlini@oracle.com>

	PR libstdc++/40511
	* config/locale/gnu/c_locale.cc: Don't use LC_CTYPE_MASK together
	with glibc2.2.x.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149089 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f123217..7b12556 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-30  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR libstdc++/40511
+       * config/locale/gnu/c_locale.cc: Don't use LC_CTYPE_MASK together
+       with glibc2.2.x.
+
 2009-06-29  Paolo Carlini  <paolo.carlini@oracle.com>
 
        * include/bits/random.tcc

diff --git a/libstdc++-v3/config/locale/gnu/c_locale.cc b/libstdc++-v3/config/locale/gnu/c_locale.cc
index 4864d25..80ef9c7 100644 (file)
--- a/libstdc++-v3/config/locale/gnu/c_locale.cc
+++ b/libstdc++-v3/config/locale/gnu/c_locale.cc
@@ -155,7 +155,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     if (__dup == __c_locale(0))
       __throw_runtime_error(__N("locale::facet::_S_lc_ctype_c_locale "
                                "duplocale error"));
+#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
     __c_locale __changed = __newlocale(LC_CTYPE_MASK, __s, __dup);
+#else
+    __c_locale __changed = __newlocale(1 << LC_CTYPE, __s, __dup);
+#endif
     if (__changed == __c_locale(0))
       {
        __freelocale(__dup);