rename module 'wctype'

[Bruno Haible]

Among the modules for wide characters and wide strings to be added is
also 'wctype'. This function is missing on mingw. So we have to
distinguish the module which provides <wctype.h> from the module that
provides wctype(). Let's resolve this conflict the same way as we did
for 'fcntl' and 'poll'.

The transition should be smooth for existing users of gnulib, since
'wctype' will depend on 'wctype-h'.

Here's the proposed patch:


2011-02-06  Bruno Haible  <address@hidden>

        Rename module 'wctype' to 'wctype-h'.
        * modules/wctype-h: Renamed from modules/wctype.
        * modules/wctype: Simplyfy to a redirection to 'wctype-h'.
        * modules/wctype-h-tests: Renamed from modules/wctype-tests.
        (Files, Depends-on, Makefile.am): Update.
        * modules/wctype-h-c++-tests: Renamed from modules/wctype-c++-tests.
        (Files, Makefile.am): Update.
        * tests/test-wctype-h.c: Renamed from tests/test-wctype.c.
        * tests/test-wctype-h-c++.cc: Renamed from tests/test-wctype-c++.cc.
        * doc/posix-headers/wctype.texi: Update.
        * doc/posix-functions/iswalnum.texi: Update.
        * doc/posix-functions/iswalpha.texi: Update.
        * doc/posix-functions/iswblank.texi: Update.
        * doc/posix-functions/iswcntrl.texi: Update.
        * doc/posix-functions/iswdigit.texi: Update.
        * doc/posix-functions/iswgraph.texi: Update.
        * doc/posix-functions/iswlower.texi: Update.
        * doc/posix-functions/iswprint.texi: Update.
        * doc/posix-functions/iswpunct.texi: Update.
        * doc/posix-functions/iswspace.texi: Update.
        * doc/posix-functions/iswupper.texi: Update.
        * doc/posix-functions/iswxdigit.texi: Update.
        * doc/posix-functions/towlower.texi: Update.
        * doc/posix-functions/towupper.texi: Update.
        * NEWS: Mention the change.
        * modules/fnmatch (Dependencies): Add wctype-h, remove wctype.
        * modules/mbchar (Dependencies): Likewise.
        * modules/mbswidth (Dependencies): Likewise.
        * modules/quotearg (Dependencies): Likewise.
        * modules/regex (Dependencies): Likewise.
        * modules/wcscasecmp (Dependencies): Likewise.
        * modules/wcsncasecmp (Dependencies): Likewise.
        * modules/wcwidth (Dependencies): Likewise.

--- NEWS.orig   Sun Feb  6 18:42:32 2011
+++ NEWS        Sun Feb  6 18:16:41 2011
@@ -12,6 +12,8 @@
 
 Date        Modules         Changes
 
+2011-02-06  wctype          This module is renamed to wctype-h.
+
 2011-01-18  multiarch       This no longer #defines AA_APPLE_UNIVERSAL_BUILD;
                             instead, use the shell var APPLE_UNIVERSAL_BUILD.
 
--- doc/posix-functions/iswalnum.texi.orig      Sun Feb  6 18:42:33 2011
+++ doc/posix-functions/iswalnum.texi   Sun Feb  6 18:28:54 2011
@@ -4,7 +4,7 @@
 
 POSIX specification:@* 
@url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswalnum.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize
--- doc/posix-functions/iswalpha.texi.orig      Sun Feb  6 18:42:33 2011
+++ doc/posix-functions/iswalpha.texi   Sun Feb  6 18:28:55 2011
@@ -4,7 +4,7 @@
 
 POSIX specification:@* 
@url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswalpha.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize
--- doc/posix-functions/iswblank.texi.orig      Sun Feb  6 18:42:33 2011
+++ doc/posix-functions/iswblank.texi   Sun Feb  6 18:28:55 2011
@@ -4,7 +4,7 @@
 
 POSIX specification:@* 
@url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswblank.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize
--- doc/posix-functions/iswcntrl.texi.orig      Sun Feb  6 18:42:33 2011
+++ doc/posix-functions/iswcntrl.texi   Sun Feb  6 18:28:55 2011
@@ -4,7 +4,7 @@
 
 POSIX specification:@* 
@url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswcntrl.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize
--- doc/posix-functions/iswdigit.texi.orig      Sun Feb  6 18:42:33 2011
+++ doc/posix-functions/iswdigit.texi   Sun Feb  6 18:28:55 2011
@@ -4,7 +4,7 @@
 
 POSIX specification:@* 
@url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswdigit.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize
--- doc/posix-functions/iswgraph.texi.orig      Sun Feb  6 18:42:33 2011
+++ doc/posix-functions/iswgraph.texi   Sun Feb  6 18:28:55 2011
@@ -4,7 +4,7 @@
 
 POSIX specification:@* 
@url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswgraph.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize
--- doc/posix-functions/iswlower.texi.orig      Sun Feb  6 18:42:33 2011
+++ doc/posix-functions/iswlower.texi   Sun Feb  6 18:28:55 2011
@@ -4,7 +4,7 @@
 
 POSIX specification:@* 
@url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswlower.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize
--- doc/posix-functions/iswprint.texi.orig      Sun Feb  6 18:42:33 2011
+++ doc/posix-functions/iswprint.texi   Sun Feb  6 18:28:55 2011
@@ -4,7 +4,7 @@
 
 POSIX specification:@* 
@url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswprint.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize
--- doc/posix-functions/iswpunct.texi.orig      Sun Feb  6 18:42:33 2011
+++ doc/posix-functions/iswpunct.texi   Sun Feb  6 18:28:55 2011
@@ -4,7 +4,7 @@
 
 POSIX specification:@* 
@url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswpunct.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize
--- doc/posix-functions/iswspace.texi.orig      Sun Feb  6 18:42:33 2011
+++ doc/posix-functions/iswspace.texi   Sun Feb  6 18:28:55 2011
@@ -4,7 +4,7 @@
 
 POSIX specification:@* 
@url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswspace.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize
--- doc/posix-functions/iswupper.texi.orig      Sun Feb  6 18:42:33 2011
+++ doc/posix-functions/iswupper.texi   Sun Feb  6 18:28:55 2011
@@ -4,7 +4,7 @@
 
 POSIX specification:@* 
@url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswupper.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize
--- doc/posix-functions/iswxdigit.texi.orig     Sun Feb  6 18:42:33 2011
+++ doc/posix-functions/iswxdigit.texi  Sun Feb  6 18:28:55 2011
@@ -4,7 +4,7 @@
 
 POSIX specification:@* 
@url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswxdigit.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize
--- doc/posix-functions/towlower.texi.orig      Sun Feb  6 18:42:33 2011
+++ doc/posix-functions/towlower.texi   Sun Feb  6 18:28:55 2011
@@ -4,7 +4,7 @@
 
 POSIX specification:@* 
@url{http://www.opengroup.org/onlinepubs/9699919799/functions/towlower.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize
--- doc/posix-functions/towupper.texi.orig      Sun Feb  6 18:42:33 2011
+++ doc/posix-functions/towupper.texi   Sun Feb  6 18:28:56 2011
@@ -4,7 +4,7 @@
 
 POSIX specification:@* 
@url{http://www.opengroup.org/onlinepubs/9699919799/functions/towupper.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize
--- doc/posix-headers/wctype.texi.orig  Sun Feb  6 18:42:33 2011
+++ doc/posix-headers/wctype.texi       Sun Feb  6 18:28:56 2011
@@ -3,7 +3,7 @@
 
 POSIX specification:@* 
@url{http://www.opengroup.org/onlinepubs/9699919799/basedefs/wctype.h.html}
 
-Gnulib module: wctype
+Gnulib module: wctype-h
 
 Portability problems fixed by Gnulib:
 @itemize
--- modules/fnmatch.orig        Sun Feb  6 18:42:33 2011
+++ modules/fnmatch     Sun Feb  6 18:16:09 2011
@@ -14,7 +14,7 @@
 alloca
 stdbool
 wchar
-wctype
+wctype-h
 memchr
 memcmp
 mbsrtowcs
--- modules/mbchar.orig Sun Feb  6 18:42:33 2011
+++ modules/mbchar      Sun Feb  6 18:16:03 2011
@@ -10,7 +10,7 @@
 extensions
 stdbool
 wchar
-wctype
+wctype-h
 wcwidth
 memcmp
 
--- modules/mbswidth.orig       Sun Feb  6 18:42:33 2011
+++ modules/mbswidth    Sun Feb  6 18:16:06 2011
@@ -10,7 +10,7 @@
 
 Depends-on:
 wchar
-wctype
+wctype-h
 mbrtowc
 mbsinit
 wcwidth
--- modules/quotearg.orig       Sun Feb  6 18:42:33 2011
+++ modules/quotearg    Sun Feb  6 18:16:11 2011
@@ -17,7 +17,7 @@
 quotearg-simple
 stdbool
 wchar
-wctype
+wctype-h
 xalloc
 
 configure.ac:
--- modules/regex.orig  Sun Feb  6 18:42:33 2011
+++ modules/regex       Sun Feb  6 18:15:53 2011
@@ -28,7 +28,7 @@
 ssize_t
 wchar
 wcrtomb
-wctype
+wctype-h
 
 configure.ac:
 gl_REGEX
--- modules/wcscasecmp.orig     Sun Feb  6 18:42:33 2011
+++ modules/wcscasecmp  Sun Feb  6 18:15:56 2011
@@ -8,7 +8,7 @@
 
 Depends-on:
 wchar
-wctype
+wctype-h
 
 configure.ac:
 gl_FUNC_WCSCASECMP
--- modules/wcsncasecmp.orig    Sun Feb  6 18:42:33 2011
+++ modules/wcsncasecmp Sun Feb  6 18:15:50 2011
@@ -8,7 +8,7 @@
 
 Depends-on:
 wchar
-wctype
+wctype-h
 
 configure.ac:
 gl_FUNC_WCSNCASECMP
--- modules/wctype-h-c++-tests.orig     Sun Feb  6 18:42:33 2011
+++ modules/wctype-h-c++-tests  Sun Feb  6 18:19:03 2011
@@ -1,5 +1,5 @@
 Files:
-tests/test-wctype-c++.cc
+tests/test-wctype-h-c++.cc
 tests/signature.h
 
 Status:
@@ -12,8 +12,8 @@
 
 Makefile.am:
 if ANSICXX
-TESTS += test-wctype-c++
-check_PROGRAMS += test-wctype-c++
-test_wctype_c___SOURCES = test-wctype-c++.cc
-test_wctype_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP) $(LIB_EACCESS)
+TESTS += test-wctype-h-c++
+check_PROGRAMS += test-wctype-h-c++
+test_wctype_h_c___SOURCES = test-wctype-h-c++.cc
+test_wctype_h_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP) $(LIB_EACCESS)
 endif
--- modules/wctype-h-tests.orig Sun Feb  6 18:42:33 2011
+++ modules/wctype-h-tests      Sun Feb  6 18:18:30 2011
@@ -1,12 +1,12 @@
 Files:
-tests/test-wctype.c
+tests/test-wctype-h.c
 tests/macros.h
 
 Depends-on:
-wctype-c++-tests
+wctype-h-c++-tests
 
 configure.ac:
 
 Makefile.am:
-TESTS += test-wctype
-check_PROGRAMS += test-wctype
+TESTS += test-wctype-h
+check_PROGRAMS += test-wctype-h
--- modules/wcwidth.orig        Sun Feb  6 18:42:33 2011
+++ modules/wcwidth     Sun Feb  6 18:16:00 2011
@@ -10,7 +10,7 @@
 Depends-on:
 extensions
 wchar
-wctype
+wctype-h
 localcharset
 streq
 uniwidth/width

-- 
In memoriam Chris Gueffroy <http://en.wikipedia.org/wiki/Chris_Gueffroy>