2010/1/10 Bruno Haible <br...@clisp.org>: > > This patch works too (by doing the right thing when <wchar.h> is being > included > from within /usr/include/wctype.h), and seems to be the right thing, therefore > I'm applying it. >
This patch allows the build to complete too. Thanks. Chris > > 2010-01-10 Bruno Haible <br...@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 <b...@gnu.org> and > Chris Clayton <chris2...@googlemail.com> via > Mike Frysinger <vap...@gentoo.org> and Jim Meyering > <j...@meyering.net>. > > --- lib/wchar.in.h.orig Sun Jan 10 12:49:55 2010 > +++ lib/wchar.in.h Sun Jan 10 12:49:16 2010 > @@ -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> > -- No, Sir; there is nothing which has yet been contrived by man, by which so much happiness is produced as by a good tavern or inn - Doctor Samuel Johnson
