From: Bruno Haible <bruno@clisp.org>
Date: Sun, 10 Jan 2010 11:54:38 +0000 (+0100)
Subject: wchar: Fix compilation error when <wchar.h> is used from coreutils.
X-Git-Tag: v0.1~4867
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=3018f225bf0906a0e41e96adbdadbe37f8099f3b;p=gnulib.git

wchar: Fix compilation error when <wchar.h> is used from coreutils.
---

diff --git a/ChangeLog b/ChangeLog
index 9d6e38d61..bc9107f37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-10  Bruno Haible  <bruno@clisp.org>
+
+	wchar: Fix compilation error when <wchar.h> is used from coreutils.
+	* lib/wchar.in.h: Treat __need_wint_t like __need_mbstate_t.
+	Reported by Brian Gough <bjg@gnu.org> and
+	Chris Clayton <chris2553@googlemail.com> via
+	Mike Frysinger <vapier@gentoo.org> and Jim Meyering <jim@meyering.net>.
+
 2010-01-09  Bruno Haible  <bruno@clisp.org>
 
 	unistr/u16-to-u32: Reject invalid input.
diff --git a/lib/wchar.in.h b/lib/wchar.in.h
index c0323fec9..2e19666c0 100644
--- a/lib/wchar.in.h
+++ b/lib/wchar.in.h
@@ -30,9 +30,9 @@
 @PRAGMA_SYSTEM_HEADER@
 #endif
 
-#if defined __need_mbstate_t || (defined __hpux && ((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H
+#if defined __need_mbstate_t || defined __need_wint_t || (defined __hpux && ((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H
 /* Special invocation convention:
-   - Inside uClibc header files.
+   - Inside glibc and uClibc header files.
    - On HP-UX 11.00 we have a sequence of nested includes
      <wchar.h> -> <stdlib.h> -> <stdint.h>, and the latter includes <wchar.h>,
      once indirectly <stdint.h> -> <sys/types.h> -> <inttypes.h> -> <wchar.h>