Rename module wchar to wchar-h.

* modules/wchar-h: Renamed from modules/wchar.
* modules/wchar-h-tests: Renamed from modules/wchar-tests.
* modules/wchar-h-c++-tests: Renamed from modules/wchar-c++-tests.
* tests/test-wchar-h.c: Renamed from tests/test-wchar.c.
* tests/test-wchar-h-c++.cc: Renamed from tests/test-wchar-c++.cc.
* tests/test-wchar-h-c++2.cc: Renamed from tests/test-wchar-c++2.cc.
* tests/test-wchar-h-c++3.cc: Renamed from tests/test-wchar-c++3.cc.
* doc/posix-headers/wchar.texi: Update.
* modules/* (Depends-on): Update.
* modules/wchar: New file.

diff --git a/ChangeLog b/ChangeLog
index e5d50253289521a2d8fee4500644cb8db9f3caff..7b3502c6e7528cfc3876b103b848725c9a807010 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+       Rename module wchar to wchar-h.
+       * modules/wchar-h: Renamed from modules/wchar.
+       * modules/wchar-h-tests: Renamed from modules/wchar-tests.
+       * modules/wchar-h-c++-tests: Renamed from modules/wchar-c++-tests.
+       * tests/test-wchar-h.c: Renamed from tests/test-wchar.c.
+       * tests/test-wchar-h-c++.cc: Renamed from tests/test-wchar-c++.cc.
+       * tests/test-wchar-h-c++2.cc: Renamed from tests/test-wchar-c++2.cc.
+       * tests/test-wchar-h-c++3.cc: Renamed from tests/test-wchar-c++3.cc.
+       * doc/posix-headers/wchar.texi: Update.
+       * modules/* (Depends-on): Update.
+       * modules/wchar: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
        Rename module utmp to utmp-h.

diff --git a/doc/posix-headers/wchar.texi b/doc/posix-headers/wchar.texi
index c2c2006eb09bf629c8ce7bffcbcb5340e1d3dd21..ee4a7c45c0fac50a9b5370d6b9e96782ca230a51 100644 (file)
--- a/doc/posix-headers/wchar.texi
+++ b/doc/posix-headers/wchar.texi
@@ -3,8 +3,8 @@
 
 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/wchar.h.html}
 
-Gnulib module: wchar
-@mindex wchar
+Gnulib module: wchar-h
+@mindex wchar-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/modules/btowc b/modules/btowc
index cbcbddb792df9c71e0b03f5190a0d52cf87d250c..22c8734ca22c064c1e62ef4b9636cb211c64267c 100644 (file)
--- a/modules/btowc
+++ b/modules/btowc
@@ -10,7 +10,7 @@ m4/locale-fr.m4
 m4/codeset.m4
 
 Depends-on:
-wchar
+wchar-h
 mbszero         [test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1]
 mbrtowc         [test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1]
 mbtowc          [test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1]

diff --git a/modules/c32isalnum b/modules/c32isalnum
index f79abc276c599d2413dc4237ccd7e32adeeeb6b6..04ed803cb269bfcd5bc497cedabb36ecbe026b83 100644 (file)
--- a/modules/c32isalnum
+++ b/modules/c32isalnum
@@ -15,7 +15,7 @@ m4/codeset.m4
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]

diff --git a/modules/c32isalpha b/modules/c32isalpha
index 4eab9a07e5a0c62207f7187da9c1f99b69344dbd..6964786445643c14080050c28cbf0243ceef803f 100644 (file)
--- a/modules/c32isalpha
+++ b/modules/c32isalpha
@@ -15,7 +15,7 @@ m4/codeset.m4
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]

diff --git a/modules/c32isblank b/modules/c32isblank
index ca7463ca6264a307a640859278d20f8369f1e60b..dfaf3deb434e6b7f87463f7a20294f81d1e592dd 100644 (file)
--- a/modules/c32isblank
+++ b/modules/c32isblank
@@ -15,7 +15,7 @@ m4/codeset.m4
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 wctype-h
 iswblank
 localcharset    [test $REPLACE_MBSTATE_T = 1]

diff --git a/modules/c32iscntrl b/modules/c32iscntrl
index 84924150dd76629d7efd59aecc683f236a337f5b..46c9ce692f06c4dbc81bbdb28d1312043636a275 100644 (file)
--- a/modules/c32iscntrl
+++ b/modules/c32iscntrl
@@ -15,7 +15,7 @@ m4/codeset.m4
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]

diff --git a/modules/c32isdigit b/modules/c32isdigit
index 4da5e9b11e0aca37d84e6d8d27491c20f2f874c5..29ffcb890509ff1ead254693c7a8d8aa0600080f 100644 (file)
--- a/modules/c32isdigit
+++ b/modules/c32isdigit
@@ -15,7 +15,7 @@ m4/codeset.m4
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 wctype-h
 iswdigit
 localcharset    [test $REPLACE_MBSTATE_T = 1]

diff --git a/modules/c32isgraph b/modules/c32isgraph
index 6de4e60a7a2aaee157ad296e587af2329fae961e..d99a6603b5a8ea4987e47b42153b9de0d6a298f9 100644 (file)
--- a/modules/c32isgraph
+++ b/modules/c32isgraph
@@ -15,7 +15,7 @@ m4/codeset.m4
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]

diff --git a/modules/c32islower b/modules/c32islower
index f78c0a91ec13de557007f21db9bf829da6f71bb9..01c61a8b91a52ebeabe464ac42c3b7bbb70b02ab 100644 (file)
--- a/modules/c32islower
+++ b/modules/c32islower
@@ -15,7 +15,7 @@ m4/codeset.m4
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]

diff --git a/modules/c32isprint b/modules/c32isprint
index 9fe3c71731bcb63d00d002a149318fb1a3ccab7a..aefc14d67d6209321e42b23b8a049be4058b6977 100644 (file)
--- a/modules/c32isprint
+++ b/modules/c32isprint
@@ -15,7 +15,7 @@ m4/codeset.m4
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]

diff --git a/modules/c32ispunct b/modules/c32ispunct
index 46eb66b4bbe3f757a27bc3b361e81dbaa721ef13..08d2fbb4f7e21664a9befc95bc387f160834db5e 100644 (file)
--- a/modules/c32ispunct
+++ b/modules/c32ispunct
@@ -16,7 +16,7 @@ m4/codeset.m4
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 wctype-h
 iswpunct
 localcharset    [test $REPLACE_MBSTATE_T = 1]

diff --git a/modules/c32isspace b/modules/c32isspace
index d2372d8d12b42b4d27c6438cfabd74ad64ea54b8..cdb23a31feb020a30da5872e1171314cebd8efb1 100644 (file)
--- a/modules/c32isspace
+++ b/modules/c32isspace
@@ -15,7 +15,7 @@ m4/codeset.m4
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]

diff --git a/modules/c32isupper b/modules/c32isupper
index 840c2b58fecb396ad230ef6f50d79ec8fca17354..801cd2d6a61a079a75ee6e0270efbf0e12eaa9f2 100644 (file)
--- a/modules/c32isupper
+++ b/modules/c32isupper
@@ -15,7 +15,7 @@ m4/codeset.m4
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]

diff --git a/modules/c32isxdigit b/modules/c32isxdigit
index 1a95a30c469f9658285c32332800b33d48eab436..3591b1c076c828ac240fadce5626007f74059bba 100644 (file)
--- a/modules/c32isxdigit
+++ b/modules/c32isxdigit
@@ -16,7 +16,7 @@ m4/codeset.m4
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 wctype-h
 iswxdigit
 localcharset    [test $REPLACE_MBSTATE_T = 1]

diff --git a/modules/c32rtomb b/modules/c32rtomb
index 1d7170164bcb27a8ba4a12bcf819769a5537bbd9..8a4e0a0f9400ca9fa856459c6a000fbd77cf9b60 100644 (file)
--- a/modules/c32rtomb
+++ b/modules/c32rtomb
@@ -13,7 +13,7 @@ m4/codeset.m4
 Depends-on:
 uchar-h
 attribute       [test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1]
-wchar           [test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1]
+wchar-h         [test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1]
 wcrtomb         [test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1]
 localcharset    [{ test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1; } && test $SMALL_WCHAR_T = 1]
 streq           [{ test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1; } && test $SMALL_WCHAR_T = 1]

diff --git a/modules/c32snrtombs b/modules/c32snrtombs
index b3d2f698c4a3559e45e3b053f263179c8ccb8af7..83984548cc9c14e29ad1cc6d2a3e79ebb638a360 100644 (file)
--- a/modules/c32snrtombs
+++ b/modules/c32snrtombs
@@ -8,7 +8,7 @@ lib/c32srtombs-state.c
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 assert-h
 c32rtomb
 wcsnrtombs      [test $SMALL_WCHAR_T = 0]

diff --git a/modules/c32srtombs b/modules/c32srtombs
index b81cc882636d425c39fc4b029b777c8366a8d2d0..1ce6225448373a9d4475d83400e53d3d5d783f4d 100644 (file)
--- a/modules/c32srtombs
+++ b/modules/c32srtombs
@@ -8,7 +8,7 @@ lib/c32srtombs-state.c
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 assert-h
 c32rtomb
 wcsrtombs       [test $SMALL_WCHAR_T = 0]

diff --git a/modules/c32stombs b/modules/c32stombs
index 1e1b24cb913902f6e1033b789c4c4d294ac37ac6..267698ab5eb42b6745c05f3e555d67795a8abae6 100644 (file)
--- a/modules/c32stombs
+++ b/modules/c32stombs
@@ -6,7 +6,7 @@ lib/c32stombs.c
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 mbszero
 c32srtombs
 

diff --git a/modules/c32swidth b/modules/c32swidth
index 628c2981f4465ef309f244d2d46d76b848b6756f..7c61ef4493d04d7e603bc180753ea678b5719964 100644 (file)
--- a/modules/c32swidth
+++ b/modules/c32swidth
@@ -11,7 +11,7 @@ m4/codeset.m4
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 wcswidth
 c32width
 

diff --git a/modules/c32tolower b/modules/c32tolower
index a6b5fef2006c84c019ae0118050d44a6889cb3ea..139c7e2eee4101813f004a274a9c9d3316cf742b 100644 (file)
--- a/modules/c32tolower
+++ b/modules/c32tolower
@@ -15,7 +15,7 @@ m4/codeset.m4
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]

diff --git a/modules/c32toupper b/modules/c32toupper
index 103554d60f9f04f05ab5244ba8e46a0c920ee118..10f023742a6e9a2c342e9abebd630dadde07827c 100644 (file)
--- a/modules/c32toupper
+++ b/modules/c32toupper
@@ -15,7 +15,7 @@ m4/codeset.m4
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]

diff --git a/modules/c32width b/modules/c32width
index b91bb7502f4346a5742b0ad44b1820f1a5c22435..089f04af3e7d410f8c49fa240f4bf07997c161ce 100644 (file)
--- a/modules/c32width
+++ b/modules/c32width
@@ -15,7 +15,7 @@ m4/codeset.m4
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 wcwidth
 uniwidth/width
 

diff --git a/modules/dfa b/modules/dfa
index d966e6b142273681a8cc92854d2083554ca5b839..d81901153dc53dd26966ebf599fb74d442d08c83 100644 (file)
--- a/modules/dfa
+++ b/modules/dfa
@@ -37,7 +37,7 @@ uchar-h
 # to enable it.
 #uchar-h-c23
 verify
-wchar
+wchar-h
 xalloc
 xalloc-die
 

diff --git a/modules/fnmatch b/modules/fnmatch
index 601038e084c510b24137ed16232992e310949fb6..eaa8fd4353844dad803637906a2a0e44799cf3fe 100644 (file)
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -27,7 +27,7 @@ mbsinit             [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1]
 btowc               [{ test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; } && test $SMALL_WCHAR_T = 0]
 iswctype            [{ test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; } && test $SMALL_WCHAR_T = 0]
 mbsrtowcs           [{ test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; } && test $SMALL_WCHAR_T = 0]
-wchar               [{ test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; } && test $SMALL_WCHAR_T = 0]
+wchar-h             [{ test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; } && test $SMALL_WCHAR_T = 0]
 wctype-h            [{ test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; } && test $SMALL_WCHAR_T = 0]
 wctype              [{ test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; } && test $SMALL_WCHAR_T = 0]
 wmemchr             [{ test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; } && test $SMALL_WCHAR_T = 0]

diff --git a/modules/free-posix b/modules/free-posix
index 11b67ca73b1569c463ec270e2f9c5b63813b0460..15d34675727d6d12c3dbc48819eebcc5d9703092 100644 (file)
--- a/modules/free-posix
+++ b/modules/free-posix
@@ -8,7 +8,7 @@ m4/free.m4
 Depends-on:
 stdlib-h
 string-h
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_FREE

diff --git a/modules/mbfile b/modules/mbfile
index 0b62d5439e35842badb4b4c73fa3af55f10d538e..2fe3baa597c8faee3a8212839b4f871585a63f38 100644 (file)
--- a/modules/mbfile
+++ b/modules/mbfile
@@ -13,7 +13,7 @@ mbchar
 mbrtowc
 mbsinit
 mbszero
-wchar
+wchar-h
 stdbool-h
 
 configure.ac:

diff --git a/modules/mbmemcasecoll b/modules/mbmemcasecoll
index b13c6f5b1a7fe88cb4013bf2bce99069db131a85..21842acc701fd6bda892ba45828cff1bf2d725ec 100644 (file)
--- a/modules/mbmemcasecoll
+++ b/modules/mbmemcasecoll
@@ -8,7 +8,7 @@ lib/mbmemcasecoll.c
 
 Depends-on:
 stdbool-h
-wchar
+wchar-h
 uchar-h
 malloca
 mbszero

diff --git a/modules/mbrlen b/modules/mbrlen
index 974de786e813612ed4a56de47e4ca77d7d3f6e6a..a23b83ad7b649d90177ae4ec457a92e837adb31a 100644 (file)
--- a/modules/mbrlen
+++ b/modules/mbrlen
@@ -11,7 +11,7 @@ m4/locale-zh.m4
 m4/codeset.m4
 
 Depends-on:
-wchar
+wchar-h
 extensions
 mbrtowc         [test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1]
 

diff --git a/modules/mbrtowc b/modules/mbrtowc
index b982911c44e54c49ef09da5b0dd32cbc91395bb4..7a989178f224b43882fbea36c569387416d55739 100644 (file)
--- a/modules/mbrtowc
+++ b/modules/mbrtowc
@@ -20,7 +20,7 @@ m4/threadlib.m4
 m4/visibility.m4
 
 Depends-on:
-wchar
+wchar-h
 extensions
 attribute       [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
 stdint-h        [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]

diff --git a/modules/mbsinit b/modules/mbsinit
index 650aa174f287b70bf25a5f3009e2f259bab83b4b..16c6ae0c0dbb98ab69089bafb257db62ce36f809 100644 (file)
--- a/modules/mbsinit
+++ b/modules/mbsinit
@@ -8,7 +8,7 @@ m4/mbstate_t.m4
 m4/mbrtowc.m4
 
 Depends-on:
-wchar
+wchar-h
 extensions
 assert-h        [test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1]
 mbrtowc         [test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1]

diff --git a/modules/mbsnrtoc32s b/modules/mbsnrtoc32s
index afd01fa9caec3c9a422a510a29006355f3cf7102..f6383b96e7bdad7d4464cc4fce145ab5c5006a95 100644 (file)
--- a/modules/mbsnrtoc32s
+++ b/modules/mbsnrtoc32s
@@ -8,7 +8,7 @@ lib/mbsrtoc32s-state.c
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 assert-h
 mbrtoc32
 minmax

diff --git a/modules/mbsnrtowcs b/modules/mbsnrtowcs
index c7b8532440114f5b8aa073cd0b86fb7c3ee08407..33c72e9a54129a743eaa93e4b26ce6da56e925ac 100644 (file)
--- a/modules/mbsnrtowcs
+++ b/modules/mbsnrtowcs
@@ -13,7 +13,7 @@ m4/locale-fr.m4
 m4/codeset.m4
 
 Depends-on:
-wchar
+wchar-h
 extensions
 mbrtowc         [test $HAVE_MBSNRTOWCS = 0 || test $REPLACE_MBSNRTOWCS = 1]
 minmax          [test $HAVE_MBSNRTOWCS = 0 || test $REPLACE_MBSNRTOWCS = 1]

diff --git a/modules/mbsrtoc32s b/modules/mbsrtoc32s
index 39fcd49b5cea7df677db2ddf8f5d299adce0330c..dce767cd2e606ef20ef6eb5b8de07cad60e80698 100644 (file)
--- a/modules/mbsrtoc32s
+++ b/modules/mbsrtoc32s
@@ -8,7 +8,7 @@ lib/mbsrtoc32s-state.c
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 assert-h
 mbrtoc32
 strnlen1

diff --git a/modules/mbsrtowcs b/modules/mbsrtowcs
index 9fc971dc19c2d7bac5b505d9855568f24d463e01..4ab364191526e0722e26045f34a9fa712e30253c 100644 (file)
--- a/modules/mbsrtowcs
+++ b/modules/mbsrtowcs
@@ -15,7 +15,7 @@ m4/locale-zh.m4
 m4/codeset.m4
 
 Depends-on:
-wchar
+wchar-h
 extensions
 mbrtowc         [test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1]
 strnlen1        [test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1]

diff --git a/modules/mbstoc32s b/modules/mbstoc32s
index 0c405139f83cafc6eafbb52ef09caa27d4c35512..80232096b5e01f303bac8a528164118caa4b0136 100644 (file)
--- a/modules/mbstoc32s
+++ b/modules/mbstoc32s
@@ -6,7 +6,7 @@ lib/mbstoc32s.c
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 mbszero
 mbsrtoc32s
 

diff --git a/modules/mbswidth b/modules/mbswidth
index 58e092d10d4e2f3b2161e529118982e2709463db..5bfdf9740cbceccf3ef6be671e9192b569edb83c 100644 (file)
--- a/modules/mbswidth
+++ b/modules/mbswidth
@@ -9,7 +9,7 @@ m4/mbrtowc.m4
 m4/mbswidth.m4
 
 Depends-on:
-wchar
+wchar-h
 uchar-h
 mbrtoc32
 mbsinit

diff --git a/modules/mbszero b/modules/mbszero
index 743e539aab10df4c852b76c422729ab795291306..932a20ceb040a09665531fad39d204ce08a362b2 100644 (file)
--- a/modules/mbszero
+++ b/modules/mbszero
@@ -11,7 +11,7 @@ m4/codeset.m4
 m4/musl.m4
 
 Depends-on:
-wchar
+wchar-h
 
 configure.ac:
 AC_REQUIRE([AC_TYPE_MBSTATE_T])

diff --git a/modules/mbtowc b/modules/mbtowc
index 8644fc310f1f1ac943f4998e8340fc2db7287475..6862b1fc115bf53cd7d3103caa2f32f0e0d00bc5 100644 (file)
--- a/modules/mbtowc
+++ b/modules/mbtowc
@@ -8,7 +8,7 @@ m4/mbtowc.m4
 
 Depends-on:
 stdlib-h
-wchar           [test $HAVE_MBTOWC = 0 || test $REPLACE_MBTOWC = 1]
+wchar-h         [test $HAVE_MBTOWC = 0 || test $REPLACE_MBTOWC = 1]
 mbszero         [test $HAVE_MBTOWC = 0 || test $REPLACE_MBTOWC = 1]
 mbrtowc         [test $HAVE_MBTOWC = 0 || test $REPLACE_MBTOWC = 1]
 

diff --git a/modules/posixcheck b/modules/posixcheck
index 9c5788738ac25bf615693e54fab7fc23c5dfe568..1ea334ab8bc830ba326cc4d5519d9acb76d6b3c2 100644 (file)
--- a/modules/posixcheck
+++ b/modules/posixcheck
@@ -50,7 +50,7 @@ uchar-h
 unistd-h
 utime-h
 utmp-h
-wchar
+wchar-h
 wctype-h
 
 configure.ac:

diff --git a/modules/regex b/modules/regex
index 3b75a9513bbafe349dd74a01948a8ce381f8db3c..4263a6b0cc4026a0bfb757140d61b13c68e31884 100644 (file)
--- a/modules/regex
+++ b/modules/regex
@@ -40,7 +40,7 @@ stdbool-h               [test $ac_use_included_regex = yes]
 stdckdint-h             [test $ac_use_included_regex = yes]
 stdint-h                [test $ac_use_included_regex = yes]
 verify                  [test $ac_use_included_regex = yes]
-wchar                   [test $ac_use_included_regex = yes]
+wchar-h                 [test $ac_use_included_regex = yes]
 wcrtomb                 [test $ac_use_included_regex = yes]
 wctype-h                [test $ac_use_included_regex = yes]
 wctype                  [test $ac_use_included_regex = yes]

diff --git a/modules/stdint-h-tests b/modules/stdint-h-tests
index 81a035a48fe03641d1c82cee03c4f4d9ec62a791..2546c158e262008b5d09636c667eeb139397d7d9 100644 (file)
--- a/modules/stdint-h-tests
+++ b/modules/stdint-h-tests
@@ -6,7 +6,7 @@ Depends-on:
 extensions
 verify
 intprops
-wchar
+wchar-h
 stdint-h-c++-tests
 
 configure.ac:

diff --git a/modules/uchar-h b/modules/uchar-h
index cd31ab993ddc1146b1a8d762231153c359354e86..70998d5d75e77853a19de10729a38bf3c15917ca 100644 (file)
--- a/modules/uchar-h
+++ b/modules/uchar-h
@@ -15,7 +15,7 @@ snippet/warn-on-use
 extern-inline
 assert-h
 stdint-h
-wchar
+wchar-h
 wctype-h
 
 configure.ac:

diff --git a/modules/uchar-h-c23 b/modules/uchar-h-c23
index 3a12219922fa48831b7b87a84384c283eae06f3d..dec9eaec03fa99e4bd4b574ccaee7af7b712c8ff 100644 (file)
--- a/modules/uchar-h-c23
+++ b/modules/uchar-h-c23
@@ -7,7 +7,7 @@ lib/lc-charset-unicode.c
 
 Depends-on:
 uchar-h
-wchar
+wchar-h
 iconv
 localcharset
 streq

diff --git a/modules/unistdio/u-printf-args b/modules/unistdio/u-printf-args
index efed3d7a2fd01a585b2f00bc1721c8f0cadac818..188c6fd963fd709681dfa57e9ee4a8de347da07b 100644 (file)
--- a/modules/unistdio/u-printf-args
+++ b/modules/unistdio/u-printf-args
@@ -15,7 +15,7 @@ Depends-on:
 stdint-h
 limits-h
 unitypes-h
-wchar
+wchar-h
 
 configure.ac:
 gl_PREREQ_PRINTF_ARGS

diff --git a/modules/vasnprintf b/modules/vasnprintf
index 98ac72ada0069356865f26c22aa1dc1c2fa1ec86..96fb2088917090af595bc15561ba67c5a1043b07 100644 (file)
--- a/modules/vasnprintf
+++ b/modules/vasnprintf
@@ -31,7 +31,7 @@ xsize
 errno-h
 memchr
 assert-h
-wchar
+wchar-h
 mbszero
 
 configure.ac:

diff --git a/modules/vasnwprintf b/modules/vasnwprintf
index 0bf89666c25fbcad3911bc5ae77c66d43a261346..3d8015f3786f54898d8cdf5a5ea3d3d951394820 100644 (file)
--- a/modules/vasnwprintf
+++ b/modules/vasnwprintf
@@ -35,7 +35,7 @@ xsize
 errno-h
 memchr
 assert-h
-wchar
+wchar-h
 mbszero
 mbrtowc
 wmemcpy

diff --git a/modules/wchar b/modules/wchar
index 8b733238f10c1400e6d62e4bd0995abe92cf19cc..b653bc719e8dc1c92b6cbe40aada30c2468a365c 100644 (file)
--- a/modules/wchar
+++ b/modules/wchar
@@ -2,165 +2,20 @@ Description:
 A <wchar.h> that works around platform issues.
 Note also the wchar-single module.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'wchar-h' instead.
+
 Files:
-lib/wchar.in.h
-m4/wchar_h.m4
-m4/wint_t.m4
 
 Depends-on:
-gen-header
-include_next
-snippet/arg-nonnull
-snippet/c++defs
-snippet/warn-on-use
-extern-inline
-inttypes-h-incomplete
-stddef-h
-stdlib-h
+wchar-h
 
 configure.ac:
-gl_WCHAR_H
-gl_WCHAR_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += wchar.h
-
-# We need the following in order to create <wchar.h> when the system
-# version does not work standalone.
-wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-@NMD@  $(AM_V_GEN)$(MKDIR_P) '%reldir%'
-       $(gl_V_at)$(SED_HEADER_STDOUT) \
-             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-             -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-             -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \
-             -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
-             -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \
-             -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \
-             -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \
-             -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \
-             -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \
-             -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \
-             -e 's/@''GNULIB_MBSZERO''@/$(GNULIB_MBSZERO)/g' \
-             -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \
-             -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \
-             -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \
-             -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \
-             -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \
-             -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \
-             -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \
-             -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \
-             -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \
-             -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \
-             -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \
-             -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \
-             -e 's/@''GNULIB_WMEMPCPY''@/$(GNULIB_WMEMPCPY)/g' \
-             -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \
-             -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \
-             -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \
-             -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \
-             -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \
-             -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \
-             -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \
-             -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \
-             -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \
-             -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \
-             -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \
-             -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \
-             -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \
-             -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \
-             -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \
-             -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \
-             -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \
-             -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \
-             -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \
-             -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \
-             -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \
-             -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \
-             -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \
-             -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \
-             -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \
-             -e 's/@''GNULIB_WGETCWD''@/$(GNULIB_WGETCWD)/g' \
-             -e 's/@''GNULIB_MDA_WCSDUP''@/$(GNULIB_MDA_WCSDUP)/g' \
-             -e 's/@''GNULIB_FREE_POSIX''@/$(GNULIB_FREE_POSIX)/g' \
-             < $(srcdir)/wchar.in.h > $@-t1
-       $(AM_V_at)sed \
-             -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
-             -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
-             -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
-             -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
-             -e 's|@''HAVE_MBRLEN''@|$(HAVE_MBRLEN)|g' \
-             -e 's|@''HAVE_MBSRTOWCS''@|$(HAVE_MBSRTOWCS)|g' \
-             -e 's|@''HAVE_MBSNRTOWCS''@|$(HAVE_MBSNRTOWCS)|g' \
-             -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \
-             -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \
-             -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \
-             -e 's|@''HAVE_WMEMCHR''@|$(HAVE_WMEMCHR)|g' \
-             -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \
-             -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \
-             -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \
-             -e 's|@''HAVE_WMEMPCPY''@|$(HAVE_WMEMPCPY)|g' \
-             -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \
-             -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \
-             -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \
-             -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \
-             -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \
-             -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \
-             -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \
-             -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \
-             -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \
-             -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \
-             -e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \
-             -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \
-             -e 's|@''HAVE_WCSNCASECMP''@|$(HAVE_WCSNCASECMP)|g' \
-             -e 's|@''HAVE_WCSCOLL''@|$(HAVE_WCSCOLL)|g' \
-             -e 's|@''HAVE_WCSXFRM''@|$(HAVE_WCSXFRM)|g' \
-             -e 's|@''HAVE_WCSDUP''@|$(HAVE_WCSDUP)|g' \
-             -e 's|@''HAVE_WCSCHR''@|$(HAVE_WCSCHR)|g' \
-             -e 's|@''HAVE_WCSRCHR''@|$(HAVE_WCSRCHR)|g' \
-             -e 's|@''HAVE_WCSCSPN''@|$(HAVE_WCSCSPN)|g' \
-             -e 's|@''HAVE_WCSSPN''@|$(HAVE_WCSSPN)|g' \
-             -e 's|@''HAVE_WCSPBRK''@|$(HAVE_WCSPBRK)|g' \
-             -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \
-             -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \
-             -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \
-             -e 's|@''HAVE_WCSFTIME''@|$(HAVE_WCSFTIME)|g' \
-             -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
-             -e 's|@''HAVE_DECL_WCSDUP''@|$(HAVE_DECL_WCSDUP)|g' \
-             -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
-             < $@-t1 > $@-t2
-       $(AM_V_at)sed \
-             -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
-             -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
-             -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
-             -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \
-             -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \
-             -e 's|@''REPLACE_MBRTOWC''@|$(REPLACE_MBRTOWC)|g' \
-             -e 's|@''REPLACE_MBRLEN''@|$(REPLACE_MBRLEN)|g' \
-             -e 's|@''REPLACE_MBSRTOWCS''@|$(REPLACE_MBSRTOWCS)|g' \
-             -e 's|@''REPLACE_MBSNRTOWCS''@|$(REPLACE_MBSNRTOWCS)|g' \
-             -e 's|@''REPLACE_WCRTOMB''@|$(REPLACE_WCRTOMB)|g' \
-             -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \
-             -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
-             -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
-             -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \
-             -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \
-             -e 's|@''REPLACE_WCSCMP''@|$(REPLACE_WCSCMP)|g' \
-             -e 's|@''REPLACE_WCSNCAT''@|$(REPLACE_WCSNCAT)|g' \
-             -e 's|@''REPLACE_WCSNCMP''@|$(REPLACE_WCSNCMP)|g' \
-             -e 's|@''REPLACE_WCSSTR''@|$(REPLACE_WCSSTR)|g' \
-             -e 's|@''REPLACE_WCSTOK''@|$(REPLACE_WCSTOK)|g' \
-             -e 's|@''REPLACE_WMEMCMP''@|$(REPLACE_WMEMCMP)|g' \
-             -e 's|@''REPLACE_WMEMPCPY''@|$(REPLACE_WMEMPCPY)|g' \
-             -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-             -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $@-t2 > $@-t3
-       $(AM_V_at)rm -f $@-t1 $@-t2
-       $(AM_V_at)mv $@-t3 $@
-MOSTLYCLEANFILES += wchar.h wchar.h-t1 wchar.h-t2 wchar.h-t3
 
 Include:
 <wchar.h>
@@ -169,4 +24,3 @@ License:
 LGPLv2+
 
 Maintainer:
-all

diff --git a/modules/wchar-c++-tests b/modules/wchar-c++-tests
deleted file mode 100644 (file)
index f355de0..0000000
--- a/modules/wchar-c++-tests
+++ /dev/null
@@ -1,21 +0,0 @@
-Files:
-tests/test-wchar-c++.cc
-tests/test-wchar-c++2.cc
-tests/test-wchar-c++3.cc
-tests/signature.h
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-wchar-c++
-check_PROGRAMS += test-wchar-c++
-test_wchar_c___SOURCES = test-wchar-c++.cc test-wchar-c++2.cc test-wchar-c++3.cc
-test_wchar_c___LDADD = $(LDADD) $(LIBUNISTRING) $(LIBINTL) $(NANOSLEEP_LIB) $(EUIDACCESS_LIBGEN) $(LIBTHREAD)
-endif

diff --git a/modules/wchar-h b/modules/wchar-h
new file mode 100644 (file)
index 0000000..8b73323
--- /dev/null
+++ b/modules/wchar-h
@@ -0,0 +1,172 @@
+Description:
+A <wchar.h> that works around platform issues.
+Note also the wchar-single module.
+
+Files:
+lib/wchar.in.h
+m4/wchar_h.m4
+m4/wint_t.m4
+
+Depends-on:
+gen-header
+include_next
+snippet/arg-nonnull
+snippet/c++defs
+snippet/warn-on-use
+extern-inline
+inttypes-h-incomplete
+stddef-h
+stdlib-h
+
+configure.ac:
+gl_WCHAR_H
+gl_WCHAR_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += wchar.h
+
+# We need the following in order to create <wchar.h> when the system
+# version does not work standalone.
+wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+@NMD@  $(AM_V_GEN)$(MKDIR_P) '%reldir%'
+       $(gl_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+             -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+             -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \
+             -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
+             -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \
+             -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \
+             -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \
+             -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \
+             -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \
+             -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \
+             -e 's/@''GNULIB_MBSZERO''@/$(GNULIB_MBSZERO)/g' \
+             -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \
+             -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \
+             -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \
+             -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \
+             -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \
+             -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \
+             -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \
+             -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \
+             -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \
+             -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \
+             -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \
+             -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \
+             -e 's/@''GNULIB_WMEMPCPY''@/$(GNULIB_WMEMPCPY)/g' \
+             -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \
+             -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \
+             -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \
+             -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \
+             -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \
+             -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \
+             -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \
+             -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \
+             -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \
+             -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \
+             -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \
+             -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \
+             -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \
+             -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \
+             -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \
+             -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \
+             -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \
+             -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \
+             -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \
+             -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \
+             -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \
+             -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \
+             -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \
+             -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \
+             -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \
+             -e 's/@''GNULIB_WGETCWD''@/$(GNULIB_WGETCWD)/g' \
+             -e 's/@''GNULIB_MDA_WCSDUP''@/$(GNULIB_MDA_WCSDUP)/g' \
+             -e 's/@''GNULIB_FREE_POSIX''@/$(GNULIB_FREE_POSIX)/g' \
+             < $(srcdir)/wchar.in.h > $@-t1
+       $(AM_V_at)sed \
+             -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
+             -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
+             -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
+             -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
+             -e 's|@''HAVE_MBRLEN''@|$(HAVE_MBRLEN)|g' \
+             -e 's|@''HAVE_MBSRTOWCS''@|$(HAVE_MBSRTOWCS)|g' \
+             -e 's|@''HAVE_MBSNRTOWCS''@|$(HAVE_MBSNRTOWCS)|g' \
+             -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \
+             -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \
+             -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \
+             -e 's|@''HAVE_WMEMCHR''@|$(HAVE_WMEMCHR)|g' \
+             -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \
+             -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \
+             -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \
+             -e 's|@''HAVE_WMEMPCPY''@|$(HAVE_WMEMPCPY)|g' \
+             -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \
+             -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \
+             -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \
+             -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \
+             -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \
+             -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \
+             -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \
+             -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \
+             -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \
+             -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \
+             -e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \
+             -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \
+             -e 's|@''HAVE_WCSNCASECMP''@|$(HAVE_WCSNCASECMP)|g' \
+             -e 's|@''HAVE_WCSCOLL''@|$(HAVE_WCSCOLL)|g' \
+             -e 's|@''HAVE_WCSXFRM''@|$(HAVE_WCSXFRM)|g' \
+             -e 's|@''HAVE_WCSDUP''@|$(HAVE_WCSDUP)|g' \
+             -e 's|@''HAVE_WCSCHR''@|$(HAVE_WCSCHR)|g' \
+             -e 's|@''HAVE_WCSRCHR''@|$(HAVE_WCSRCHR)|g' \
+             -e 's|@''HAVE_WCSCSPN''@|$(HAVE_WCSCSPN)|g' \
+             -e 's|@''HAVE_WCSSPN''@|$(HAVE_WCSSPN)|g' \
+             -e 's|@''HAVE_WCSPBRK''@|$(HAVE_WCSPBRK)|g' \
+             -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \
+             -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \
+             -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \
+             -e 's|@''HAVE_WCSFTIME''@|$(HAVE_WCSFTIME)|g' \
+             -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
+             -e 's|@''HAVE_DECL_WCSDUP''@|$(HAVE_DECL_WCSDUP)|g' \
+             -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
+             < $@-t1 > $@-t2
+       $(AM_V_at)sed \
+             -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
+             -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
+             -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
+             -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \
+             -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \
+             -e 's|@''REPLACE_MBRTOWC''@|$(REPLACE_MBRTOWC)|g' \
+             -e 's|@''REPLACE_MBRLEN''@|$(REPLACE_MBRLEN)|g' \
+             -e 's|@''REPLACE_MBSRTOWCS''@|$(REPLACE_MBSRTOWCS)|g' \
+             -e 's|@''REPLACE_MBSNRTOWCS''@|$(REPLACE_MBSNRTOWCS)|g' \
+             -e 's|@''REPLACE_WCRTOMB''@|$(REPLACE_WCRTOMB)|g' \
+             -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \
+             -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
+             -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
+             -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \
+             -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \
+             -e 's|@''REPLACE_WCSCMP''@|$(REPLACE_WCSCMP)|g' \
+             -e 's|@''REPLACE_WCSNCAT''@|$(REPLACE_WCSNCAT)|g' \
+             -e 's|@''REPLACE_WCSNCMP''@|$(REPLACE_WCSNCMP)|g' \
+             -e 's|@''REPLACE_WCSSTR''@|$(REPLACE_WCSSTR)|g' \
+             -e 's|@''REPLACE_WCSTOK''@|$(REPLACE_WCSTOK)|g' \
+             -e 's|@''REPLACE_WMEMCMP''@|$(REPLACE_WMEMCMP)|g' \
+             -e 's|@''REPLACE_WMEMPCPY''@|$(REPLACE_WMEMPCPY)|g' \
+             -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+             -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+             < $@-t2 > $@-t3
+       $(AM_V_at)rm -f $@-t1 $@-t2
+       $(AM_V_at)mv $@-t3 $@
+MOSTLYCLEANFILES += wchar.h wchar.h-t1 wchar.h-t2 wchar.h-t3
+
+Include:
+<wchar.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all

diff --git a/modules/wchar-h-c++-tests b/modules/wchar-h-c++-tests
new file mode 100644 (file)
index 0000000..1509b02
--- /dev/null
+++ b/modules/wchar-h-c++-tests
@@ -0,0 +1,21 @@
+Files:
+tests/test-wchar-h-c++.cc
+tests/test-wchar-h-c++2.cc
+tests/test-wchar-h-c++3.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-wchar-h-c++
+check_PROGRAMS += test-wchar-h-c++
+test_wchar_h_c___SOURCES = test-wchar-h-c++.cc test-wchar-h-c++2.cc test-wchar-h-c++3.cc
+test_wchar_h_c___LDADD = $(LDADD) $(LIBUNISTRING) $(LIBINTL) $(NANOSLEEP_LIB) $(EUIDACCESS_LIBGEN) $(LIBTHREAD)
+endif

diff --git a/modules/wchar-h-tests b/modules/wchar-h-tests
new file mode 100644 (file)
index 0000000..370f574
--- /dev/null
+++ b/modules/wchar-h-tests
@@ -0,0 +1,12 @@
+Files:
+tests/test-wchar-h.c
+
+Depends-on:
+assert-h
+wchar-h-c++-tests
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-wchar-h
+check_PROGRAMS += test-wchar-h

diff --git a/modules/wchar-single b/modules/wchar-single
index 08f6a850210ad86baceeb340678612fb313320de..6545c83bdee7494867b9cb6c86d86220cf069b9d 100644 (file)
--- a/modules/wchar-single
+++ b/modules/wchar-single
@@ -5,7 +5,7 @@ the locale charset will not change between calls.
 Files:
 
 Depends-on:
-wchar
+wchar-h
 
 configure.ac:
 AC_DEFINE([GNULIB_WCHAR_SINGLE_LOCALE], [1],

diff --git a/modules/wchar-tests b/modules/wchar-tests
deleted file mode 100644 (file)
index 3e6b6cf..0000000
--- a/modules/wchar-tests
+++ /dev/null
@@ -1,12 +0,0 @@
-Files:
-tests/test-wchar.c
-
-Depends-on:
-assert-h
-wchar-c++-tests
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-wchar
-check_PROGRAMS += test-wchar

diff --git a/modules/wcpcpy b/modules/wcpcpy
index 65bd6e94c2c73ac3ffb6df907fbbcdfb7e93cf13..790f73bd106c27af9f8f08f58b710f1096150773 100644 (file)
--- a/modules/wcpcpy
+++ b/modules/wcpcpy
@@ -14,7 +14,7 @@ m4/wcpcpy.m4
 
 Depends-on:
 extensions
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WCPCPY

diff --git a/modules/wcpncpy b/modules/wcpncpy
index 04e90071ea76253012cc6060bdd03ff37f6cecd6..be4d7d38f855f51e749cdc699b92fb67f7006b92 100644 (file)
--- a/modules/wcpncpy
+++ b/modules/wcpncpy
@@ -8,7 +8,7 @@ m4/wcpncpy.m4
 
 Depends-on:
 extensions
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WCPNCPY

diff --git a/modules/wcrtomb b/modules/wcrtomb
index de87c7ec92afdcb55efae4f2fab0f6f714ed819f..dc0a61adb65b66c6ea5e9011e59aac573b6adf5b 100644 (file)
--- a/modules/wcrtomb
+++ b/modules/wcrtomb
@@ -13,7 +13,7 @@ m4/locale-zh.m4
 m4/codeset.m4
 
 Depends-on:
-wchar
+wchar-h
 extensions
 mbsinit         [test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1]
 

diff --git a/modules/wcscasecmp b/modules/wcscasecmp
index 2799816ad0887aec30afa84682a67dbdfe9031c4..2bd52e88a959051b7b28da3669d2ee41e34291dd 100644 (file)
--- a/modules/wcscasecmp
+++ b/modules/wcscasecmp
@@ -7,7 +7,7 @@ lib/wcscasecmp-impl.h
 m4/wcscasecmp.m4
 
 Depends-on:
-wchar
+wchar-h
 wctype-h        [test $HAVE_WCSCASECMP = 0]
 
 configure.ac:

diff --git a/modules/wcscat b/modules/wcscat
index 80c74e2273bc04b29eaf0eccb8c7581a12fe62c4..3b6ea427998e58245a45b3517c5ce7ead1510f48 100644 (file)
--- a/modules/wcscat
+++ b/modules/wcscat
@@ -13,7 +13,7 @@ lib/wcscat-impl.h
 m4/wcscat.m4
 
 Depends-on:
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WCSCAT

diff --git a/modules/wcschr b/modules/wcschr
index 9595b16fec468efbc6df56c8a260a8f326c29554..7acac7e0dec375db7adae6d093d16644b356d2d5 100644 (file)
--- a/modules/wcschr
+++ b/modules/wcschr
@@ -13,7 +13,7 @@ lib/wcschr-impl.h
 m4/wcschr.m4
 
 Depends-on:
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WCSCHR

diff --git a/modules/wcscmp b/modules/wcscmp
index 6df70f0543fb0a8ab38a04e75d3b69222085aef1..5f1b07da7fcb666f3a1e4517fbc300afab27f1bd 100644 (file)
--- a/modules/wcscmp
+++ b/modules/wcscmp
@@ -7,7 +7,7 @@ lib/wcscmp-impl.h
 m4/wcscmp.m4
 
 Depends-on:
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WCSCMP

diff --git a/modules/wcscoll b/modules/wcscoll
index 5a6ffa32674187c8951b0b92120002ed4ed3d872..4c5186fe8e4d9b2143115a9c9af5afcf38a271ef 100644 (file)
--- a/modules/wcscoll
+++ b/modules/wcscoll
@@ -14,7 +14,7 @@ m4/wcscoll.m4
 
 Depends-on:
 free-posix
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WCSCOLL

diff --git a/modules/wcscpy b/modules/wcscpy
index e37462fcd71bd5f0cdfa8344c62d56861ce4b0e6..f5c2959940542f31c18f8f06984ca87331c16862 100644 (file)
--- a/modules/wcscpy
+++ b/modules/wcscpy
@@ -13,7 +13,7 @@ lib/wcscpy-impl.h
 m4/wcscpy.m4
 
 Depends-on:
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WCSCPY

diff --git a/modules/wcscspn b/modules/wcscspn
index 844b5f9cf34258b987775c23f650532627f70ffb..04bf12455e097f231e55eea02a54cfadc177a4e0 100644 (file)
--- a/modules/wcscspn
+++ b/modules/wcscspn
@@ -13,7 +13,7 @@ lib/wcscspn-impl.h
 m4/wcscspn.m4
 
 Depends-on:
-wchar
+wchar-h
 wcslen          [test $HAVE_WCSCSPN = 0]
 wcschr          [test $HAVE_WCSCSPN = 0]
 

diff --git a/modules/wcsdup b/modules/wcsdup
index 59a53c370c2cb2acc8b6a303d7dfd073c08d10b2..54226ec235e9f81d5bd16a3267894c4c320862c4 100644 (file)
--- a/modules/wcsdup
+++ b/modules/wcsdup
@@ -7,7 +7,7 @@ lib/wcsdup-impl.h
 m4/wcsdup.m4
 
 Depends-on:
-wchar
+wchar-h
 wcslen          [test $HAVE_WCSDUP = 0]
 wmemcpy         [test $HAVE_WCSDUP = 0]
 

diff --git a/modules/wcsftime b/modules/wcsftime
index 5da3efb03e71f8fc168b9069899bbd78660483aa..8dcc068fb31dd057cb21692bb282128c65e665fd 100644 (file)
--- a/modules/wcsftime
+++ b/modules/wcsftime
@@ -6,7 +6,7 @@ lib/wcsftime.c
 m4/wcsftime.m4
 
 Depends-on:
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WCSFTIME

diff --git a/modules/wcslen b/modules/wcslen
index fea4ba4ed75836cf2576136bb3e94e099c21b179..7f5d13153623ba022add33e2b6e42b110578d66a 100644 (file)
--- a/modules/wcslen
+++ b/modules/wcslen
@@ -13,7 +13,7 @@ lib/wcslen-impl.h
 m4/wcslen.m4
 
 Depends-on:
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WCSLEN

diff --git a/modules/wcsncasecmp b/modules/wcsncasecmp
index a3453b654ebbcf0d439833d57fe2b91b0145e3af..dc1341d9629eb059fe731ac2ccfccc8cf575cbb0 100644 (file)
--- a/modules/wcsncasecmp
+++ b/modules/wcsncasecmp
@@ -7,7 +7,7 @@ lib/wcsncasecmp-impl.h
 m4/wcsncasecmp.m4
 
 Depends-on:
-wchar
+wchar-h
 wctype-h        [test $HAVE_WCSNCASECMP = 0]
 
 configure.ac:

diff --git a/modules/wcsncat b/modules/wcsncat
index 86708e543ed411bdc2b62c147dd37feec07caead..5f42aa572ff06dd987a302bfd019f5de7e7f66ed 100644 (file)
--- a/modules/wcsncat
+++ b/modules/wcsncat
@@ -7,7 +7,7 @@ lib/wcsncat-impl.h
 m4/wcsncat.m4
 
 Depends-on:
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WCSNCAT

diff --git a/modules/wcsncmp b/modules/wcsncmp
index e67861d359cb1b589d790e86bec5cde4d3186b4d..400c9d62ccb3b1794d600115b7d5f4640df0c513 100644 (file)
--- a/modules/wcsncmp
+++ b/modules/wcsncmp
@@ -7,7 +7,7 @@ lib/wcsncmp-impl.h
 m4/wcsncmp.m4
 
 Depends-on:
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WCSNCMP

diff --git a/modules/wcsncpy b/modules/wcsncpy
index e8a165e6df8eb3c4a58f64124b721600023f90bb..491f1ce246499462ba6d79cf071a7815a247c627 100644 (file)
--- a/modules/wcsncpy
+++ b/modules/wcsncpy
@@ -13,7 +13,7 @@ lib/wcsncpy-impl.h
 m4/wcsncpy.m4
 
 Depends-on:
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WCSNCPY

diff --git a/modules/wcsnlen b/modules/wcsnlen
index dba67d644d411ffafc108727abd83ac815adb8c4..bc3fe3be3776748a57f8f734f736b490d73893b4 100644 (file)
--- a/modules/wcsnlen
+++ b/modules/wcsnlen
@@ -7,7 +7,7 @@ lib/wcsnlen-impl.h
 m4/wcsnlen.m4
 
 Depends-on:
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WCSNLEN

diff --git a/modules/wcsnrtombs b/modules/wcsnrtombs
index f29aa37c0ec504f636bbc3586ad97c5adff1c86d..a47f2569126724c4584ab7aa5936648a2af6f5a3 100644 (file)
--- a/modules/wcsnrtombs
+++ b/modules/wcsnrtombs
@@ -15,7 +15,7 @@ m4/locale-zh.m4
 m4/codeset.m4
 
 Depends-on:
-wchar
+wchar-h
 extensions
 wcrtomb         [test $HAVE_WCSNRTOMBS = 0 || test $REPLACE_WCSNRTOMBS = 1]
 

diff --git a/modules/wcspbrk b/modules/wcspbrk
index e42958803e8fb0d159fdf764a4642863c7bb2290..91ca015b03596cb5a0cf365b935abbc562a82241 100644 (file)
--- a/modules/wcspbrk
+++ b/modules/wcspbrk
@@ -13,7 +13,7 @@ lib/wcspbrk-impl.h
 m4/wcspbrk.m4
 
 Depends-on:
-wchar
+wchar-h
 wcschr          [test $HAVE_WCSPBRK = 0]
 
 configure.ac:

diff --git a/modules/wcsrchr b/modules/wcsrchr
index 681af3f1a55f546ca25dba851f9ece2007c16ad2..c95ff24fce17419719f23cde7ecb22e641ca8c4f 100644 (file)
--- a/modules/wcsrchr
+++ b/modules/wcsrchr
@@ -13,7 +13,7 @@ lib/wcsrchr-impl.h
 m4/wcsrchr.m4
 
 Depends-on:
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WCSRCHR

diff --git a/modules/wcsrtombs b/modules/wcsrtombs
index b478f86b6a246cf1431599adccff304f3aea8cc1..c16dea9eb071f40a14f4281760418282075c4897 100644 (file)
--- a/modules/wcsrtombs
+++ b/modules/wcsrtombs
@@ -15,7 +15,7 @@ m4/locale-zh.m4
 m4/codeset.m4
 
 Depends-on:
-wchar
+wchar-h
 extensions
 wcrtomb         [test $HAVE_WCSRTOMBS = 0 || test $REPLACE_WCSRTOMBS = 1]
 

diff --git a/modules/wcsspn b/modules/wcsspn
index 684c2676c360a2301dd02e43713061664947651e..75f0bcd7671f2be1a05d9d06e739231e27a2668b 100644 (file)
--- a/modules/wcsspn
+++ b/modules/wcsspn
@@ -13,7 +13,7 @@ lib/wcsspn-impl.h
 m4/wcsspn.m4
 
 Depends-on:
-wchar
+wchar-h
 wcschr          [test $HAVE_WCSSPN = 0]
 
 configure.ac:

diff --git a/modules/wcsstr-simple b/modules/wcsstr-simple
index c33e1e42d1b23ec001d7826db0c90fc24bd2bd1c..3c1dc2a36d1664e7fcbfe17d5ab423706db3fad0 100644 (file)
--- a/modules/wcsstr-simple
+++ b/modules/wcsstr-simple
@@ -7,7 +7,7 @@ lib/wcsstr-impl.h
 m4/wcsstr.m4
 
 Depends-on:
-wchar
+wchar-h
 wcschr          [test $HAVE_WCSSTR = 0]
 
 configure.ac:

diff --git a/modules/wcstok b/modules/wcstok
index 19593faccbb7840d00eb76f4c60cf4ee2c23e293..b59e55ad37990366c04fed951a41c6a989f4b74e 100644 (file)
--- a/modules/wcstok
+++ b/modules/wcstok
@@ -7,7 +7,7 @@ lib/wcstok-impl.h
 m4/wcstok.m4
 
 Depends-on:
-wchar
+wchar-h
 wcsspn          [test $HAVE_WCSTOK = 0 || test $REPLACE_WCSTOK = 1]
 wcspbrk         [test $HAVE_WCSTOK = 0 || test $REPLACE_WCSTOK = 1]
 

diff --git a/modules/wcswidth b/modules/wcswidth
index e4773f83c548c52d88520991167c465d9a7e6c45..13891eb6081743a228294b687483d3ee1c4896ab 100644 (file)
--- a/modules/wcswidth
+++ b/modules/wcswidth
@@ -8,7 +8,7 @@ lib/wcswidth-impl.h
 m4/wcswidth.m4
 
 Depends-on:
-wchar
+wchar-h
 wcwidth         [test $HAVE_WCSWIDTH = 0 || test $REPLACE_WCSWIDTH = 1]
 
 configure.ac:

diff --git a/modules/wcsxfrm b/modules/wcsxfrm
index ff8c8f04ca6277bc332564adb9d1d26c00dfd7cb..e4081aea2d04078d21c2cdecbe2b896a98efe79a 100644 (file)
--- a/modules/wcsxfrm
+++ b/modules/wcsxfrm
@@ -9,7 +9,7 @@ m4/wcsxfrm.m4
 
 Depends-on:
 free-posix
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WCSXFRM

diff --git a/modules/wctob b/modules/wctob
index 20abcb5c4b0b9b1029f5b976977886ff0cd6b578..ef50bf5b5ce4cf5d54a76f5b832f35e4ab1b937c 100644 (file)
--- a/modules/wctob
+++ b/modules/wctob
@@ -9,7 +9,7 @@ m4/locale-fr.m4
 m4/codeset.m4
 
 Depends-on:
-wchar
+wchar-h
 wctomb          [test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1]
 
 configure.ac:

diff --git a/modules/wctomb b/modules/wctomb
index c21de3bcc412162cc956b8760ebaaf0ed9698f61..60b486695207329bea94ce9106ec177edbaff45c 100644 (file)
--- a/modules/wctomb
+++ b/modules/wctomb
@@ -8,7 +8,7 @@ m4/wctomb.m4
 
 Depends-on:
 stdlib-h
-wchar           [test $REPLACE_WCTOMB = 1]
+wchar-h         [test $REPLACE_WCTOMB = 1]
 mbszero         [test $REPLACE_WCTOMB = 1]
 wcrtomb         [test $REPLACE_WCTOMB = 1]
 

diff --git a/modules/wcwidth b/modules/wcwidth
index 8131765e92dbd112e5f5ec7424d0edd657124667..d1cae499183d910f58aa7c1575c849fd4882807d 100644 (file)
--- a/modules/wcwidth
+++ b/modules/wcwidth
@@ -7,7 +7,7 @@ m4/wcwidth.m4
 m4/wint_t.m4
 
 Depends-on:
-wchar
+wchar-h
 extensions
 wctype-h        [test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1]
 localcharset    [test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1]

diff --git a/modules/wgetcwd-lgpl b/modules/wgetcwd-lgpl
index ed33406737634a22ca3a4bed87410768cdbd4d95..4bcf00ffcdf4c6fea81bee1f1f8367ae34eced47 100644 (file)
--- a/modules/wgetcwd-lgpl
+++ b/modules/wgetcwd-lgpl
@@ -6,7 +6,7 @@ Files:
 lib/wgetcwd-lgpl.c
 
 Depends-on:
-wchar
+wchar-h
 free-posix
 
 configure.ac:

diff --git a/modules/wmemchr b/modules/wmemchr
index 2e1e1337dbc284d277854895eba372a1797bca20..7ddc48bdb378f5e62b0060de6ef877ecaed21c55 100644 (file)
--- a/modules/wmemchr
+++ b/modules/wmemchr
@@ -7,7 +7,7 @@ lib/wmemchr-impl.h
 m4/wmemchr.m4
 
 Depends-on:
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WMEMCHR

diff --git a/modules/wmemcmp b/modules/wmemcmp
index e2b99035eeea5f21213a35405c7e208c2deebd53..02a9f8a3f67e9a70c4f62468a5d5c72a57a02067 100644 (file)
--- a/modules/wmemcmp
+++ b/modules/wmemcmp
@@ -7,7 +7,7 @@ lib/wmemcmp-impl.h
 m4/wmemcmp.m4
 
 Depends-on:
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WMEMCMP

diff --git a/modules/wmemcpy b/modules/wmemcpy
index 161762304e9a5131360b35306daf939b3800458a..2e775d482b5bceda4c6f2f200713b5d2bbfca6c5 100644 (file)
--- a/modules/wmemcpy
+++ b/modules/wmemcpy
@@ -7,7 +7,7 @@ lib/wmemcpy-impl.h
 m4/wmemcpy.m4
 
 Depends-on:
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WMEMCPY

diff --git a/modules/wmemmove b/modules/wmemmove
index 352052677471779af5562c0e7b565fbbdd3d6dfe..d63ed07d76ad371afe81f020ef6c1e2550a05b4b 100644 (file)
--- a/modules/wmemmove
+++ b/modules/wmemmove
@@ -7,7 +7,7 @@ lib/wmemmove-impl.h
 m4/wmemmove.m4
 
 Depends-on:
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WMEMMOVE

diff --git a/modules/wmempcpy b/modules/wmempcpy
index 3f8e2c511265b05f06322f5b5cf9c8175e97778f..4d6d55acad7bd5aea426630304619787f9df0a7a 100644 (file)
--- a/modules/wmempcpy
+++ b/modules/wmempcpy
@@ -6,7 +6,7 @@ lib/wmempcpy.c
 m4/wmempcpy.m4
 
 Depends-on:
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WMEMPCPY

diff --git a/modules/wmemset b/modules/wmemset
index 602352b870bf469d664b1ea71488a0af41eb9194..a1a241adb7f046fb5b6747fa1f8eded6e8920e24 100644 (file)
--- a/modules/wmemset
+++ b/modules/wmemset
@@ -7,7 +7,7 @@ lib/wmemset-impl.h
 m4/wmemset.m4
 
 Depends-on:
-wchar
+wchar-h
 
 configure.ac:
 gl_FUNC_WMEMSET

diff --git a/tests/test-wchar-c++.cc b/tests/test-wchar-h-c++.cc
similarity index 100%
rename from tests/test-wchar-c++.cc
rename to tests/test-wchar-h-c++.cc

diff --git a/tests/test-wchar-c++2.cc b/tests/test-wchar-h-c++2.cc
similarity index 100%
rename from tests/test-wchar-c++2.cc
rename to tests/test-wchar-h-c++2.cc

diff --git a/tests/test-wchar-c++3.cc b/tests/test-wchar-h-c++3.cc
similarity index 100%
rename from tests/test-wchar-c++3.cc
rename to tests/test-wchar-h-c++3.cc

diff --git a/tests/test-wchar.c b/tests/test-wchar-h.c
similarity index 100%
rename from tests/test-wchar.c
rename to tests/test-wchar-h.c