about summary refs log tree commit diff
path: root/wcsmbs
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-06-13 05:19:10 +0000
committerUlrich Drepper <drepper@redhat.com>2003-06-13 05:19:10 +0000
commite6d329961fa06384125a7c14ccc3066885f5be96 (patch)
treec3a108f11e51ceaa477be3f2818dbc5a42ebb2f9 /wcsmbs
parentb54aa55d36ab28db6d505bf34626a9ac4b639495 (diff)
downloadglibc-e6d329961fa06384125a7c14ccc3066885f5be96.tar.gz
glibc-e6d329961fa06384125a7c14ccc3066885f5be96.tar.xz
glibc-e6d329961fa06384125a7c14ccc3066885f5be96.zip
Update.
2003-06-12  Ulrich Drepper  <drepper@redhat.com>

	* wcsmbs/wchar.h: Define wint_t in std namespace, too [PR libc/5034].
Diffstat (limited to 'wcsmbs')
-rw-r--r--wcsmbs/wchar.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index 8cdd79bb70..8bab0ddd7b 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -59,8 +59,13 @@
 # define _WINT_T
 typedef unsigned int wint_t;
 #else
-# ifdef __USE_GNU
-__USING_NAMESPACE_STD(wint_t)
+/* Work around problems with the <stddef.h> file which doesn't put
+   wint_t in the std namespace.  */
+# if defined __cplusplus && defined _GLIBCPP_USE_NAMESPACES \
+     && defined __WINT_TYPE__
+__BEGIN_NAMESPACE_STD
+typedef __WINT_TYPE__ wint_t;
+__END_NAMESPACE_STD
 # endif
 #endif