summaryrefslogtreecommitdiff
path: root/libstdc++-v3/include/c_std
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2010-06-08 01:46:10 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2010-06-08 01:46:10 +0000
commitbe77e727fd52369aa3cf4be4070d45b0de26aa1e (patch)
treeef9373142d6e954982f2fd1f84a6ac933ffe2d79 /libstdc++-v3/include/c_std
parent1c78c7629a69c17fcb1a9f14ac6921ddc9e4db4b (diff)
downloadgcc-be77e727fd52369aa3cf4be4070d45b0de26aa1e.tar.gz
2010-06-07 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/44417 * include/c_std/cwctype: Provide a workaround for bug glibc BZ 9694 affecting glibc 2.9 and older. * include/c_global/cwctype: Likewise. * testsuite/util/testsuite_abi.h: Remove temporary workaround. * testsuite/util/testsuite_allocator.h: Use everywhere std::size_t and std::ptrdiff_t, don't include <cstddef>. * testsuite/27_io/basic_ostream/inserters_other/wchar_t/ error_code.cc: Minor tweak, prefer <cwchar> to <wchar.h>. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160417 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/c_std')
-rw-r--r--libstdc++-v3/include/c_std/cwctype8
1 files changed, 7 insertions, 1 deletions
diff --git a/libstdc++-v3/include/c_std/cwctype b/libstdc++-v3/include/c_std/cwctype
index 4af425067b9..d6750390a0a 100644
--- a/libstdc++-v3/include/c_std/cwctype
+++ b/libstdc++-v3/include/c_std/cwctype
@@ -45,9 +45,15 @@
#include <bits/c++config.h>
#if _GLIBCXX_HAVE_WCTYPE_H
-#include <wctype.h>
+
+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 10
+// Work around glibc BZ 9694
+#include <stddef.h>
#endif
+#include <wctype.h>
+#endif // _GLIBCXX_HAVE_WCTYPE_H
+
// Get rid of those macros defined in <wctype.h> in lieu of real functions.
#undef iswalnum
#undef iswalpha