Re: coreutils 6.6 fails to compile on IRIX 5.3

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Eric Blake on 12/26/2006 5:17 PM:
>> We could put this into every source file that includes wctype.h,
>> but I think it's cleaner to have a wctype module that handles
>> wctype gotchas like this.
>>
>> 2006-12-21  Paul Eggert  <eggert <at> cs.ucla.edu>
>>
>>      * MODULES.html.sh: New module wctype.
>>      * lib/wctype_.h, m4/wctype.m4, modules/wctype: New files.
>>      * lib/fnmatch.c: Don't bother to include <wchar.h> before
>>      <wctype.h>, since the new wctype module should fix this.
> 
> 
> This is breaking the coreutils build on cygwin, where btowc and friends are 
> in 
> <wchar.h>, and where <wctype.h> is POSIX-compliant but does not drag in the 
> entire <wchar.h>:
> 
> gcc -std=gnu99  -I.   -I/usr/local/include   -g2 -Wall -Werror -MT fnmatch.o -
> MD -MP -MF .deps/fnmatch.Tpo -c -o fnmatch.o fnmatch.c
> In file included from fnmatch.c:172:
> fnmatch_loop.c: In function `internal_fnmatch':
> fnmatch_loop.c:287: warning: implicit declaration of function `btowc'

I'm checking this in to fix this issue on platforms that do not need a
replacement <wctype.h>.  It is not a true reversion, since it rearranges
the include order to let <wctype.h> pulls in prerequisites required for
<wchar.h> on platforms where <wchar.h> is not self-standing.

2006-12-27  Eric Blake  <address@hidden>

        * lib/fnmatch.c: Reinstate inclusion of <wchar.h>, since this
        module uses more than what <wctype.h> is required to provide.

Index: lib/fnmatch.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/fnmatch.c,v
retrieving revision 1.38
diff -u -p -r1.38 fnmatch.c
- --- lib/fnmatch.c       22 Dec 2006 00:21:54 -0000      1.38
+++ lib/fnmatch.c       27 Dec 2006 13:16:57 -0000
@@ -47,6 +47,7 @@
    support user defined character classes.  */
 #if defined _LIBC || WIDE_CHAR_SUPPORT
 # include <wctype.h>
+# include <wchar.h>
 #endif

 /* We need some of the locale data (the collation sequence information)

- --
Life is short - so eat dessert first!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFknKl84KuGfSFAYARAmy8AJ98GOr0mucmqQ7IXyNWwvcLdRME9gCgu+w+
D3CmeQ2/3NCMz0WwoL06xA4=
=jVrO
-----END PGP SIGNATURE-----