* lib/wchar.in.h [defined __need_mbstate_t]: Just include <wchar.h>.

Problem reported by Erik Benada in
<http://lists.gnu.org/archive/html/bug-gnulib/2008-03/msg00249.html>.

diff --git a/ChangeLog b/ChangeLog
index b7fdd20..49ada57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/wchar.in.h [defined __need_mbstate_t]: Just include <wchar.h>.
+       Problem reported by Erik Benada in
+       <http://lists.gnu.org/archive/html/bug-gnulib/2008-03/msg00249.html>.
+
 2008-03-30  Bruno Haible  <bruno@clisp.org>
 
        * tests/test-strtod.c: Add comments about which assertion fails on which

diff --git a/lib/wchar.in.h b/lib/wchar.in.h
index 924a338..d7a1b5d 100644 (file)
--- a/lib/wchar.in.h
+++ b/lib/wchar.in.h
@@ -26,6 +26,14 @@
  * the declaration of wcwidth().
  */
 
+#ifdef __need_mbstate_t
+/* Special invocation convention inside glibc header files.  */
+
+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
+
+#else
+/* Normal invocation convention.  */
+
 #ifndef _GL_WCHAR_H
 
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
@@ -80,3 +88,4 @@ extern int wcwidth (int /* actually wchar_t */);
 
 #endif /* _GL_WCHAR_H */
 #endif /* _GL_WCHAR_H */
+#endif