Rename module uchar to uchar-h.

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

diff --git a/ChangeLog b/ChangeLog
index 23e8e7126d7c6eadc5afb935283580bfd103242b..15a235c7642e87fe20bd985f5485cddeb6610149 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+       Rename module uchar to uchar-h.
+       * modules/uchar-h: Renamed from modules/uchar.
+       * modules/uchar-h-tests: Renamed from modules/uchar-tests.
+       * modules/uchar-h-c++-tests: Renamed from modules/uchar-c++-tests.
+       * tests/test-uchar-h.c: Renamed from tests/test-uchar.c.
+       * tests/test-uchar-h-c++.cc: Renamed from tests/test-uchar-c++.cc.
+       * tests/test-uchar-h-c++2.cc: Renamed from tests/test-uchar-c++2.cc.
+       * doc/posix-headers/uchar.texi: Update.
+       * modules/* (Depends-on): Update.
+       * modules/uchar: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
        Rename module termios to termios-h.

diff --git a/doc/posix-headers/uchar.texi b/doc/posix-headers/uchar.texi
index 9c918b0842544fd8b6d48afe35d808b0b5a3966b..9abb4bc65d331231fa4fca9ddc99479088d0e5a5 100644 (file)
--- a/doc/posix-headers/uchar.texi
+++ b/doc/posix-headers/uchar.texi
@@ -9,11 +9,11 @@ Defines the types @code{char16_t}, @code{char32_t} and declares the
 functions @code{mbrtoc16}, @code{c16rtomb}, @code{mbrtoc32},
 @code{c32rtomb}.
 
-Gnulib module: uchar or uchar-c23
-@mindex uchar
+Gnulib module: uchar-h or uchar-c23
+@mindex uchar-h
 @mindex uchar-c23
 
-Portability problems fixed by either Gnulib module @code{uchar} or @code{uchar-c23}:
+Portability problems fixed by either Gnulib module @code{uchar-h} or @code{uchar-c23}:
 @itemize
 @item
 This header file is missing on many non-glibc platforms:

diff --git a/modules/btoc32 b/modules/btoc32
index e6385398ec7b98cf4de0e4d2b91829e1829f8949..e2acebb402620c61f5bff04ad352a02bdf21df51 100644 (file)
--- a/modules/btoc32
+++ b/modules/btoc32
@@ -5,7 +5,7 @@ Files:
 lib/btoc32.c
 
 Depends-on:
-uchar
+uchar-h
 mbszero
 mbrtoc32
 btowc

diff --git a/modules/c32_apply_mapping b/modules/c32_apply_mapping
index 49308259d05e3a1771346b666a7cfdcc4d82ac68..103c03708473012ca6d888b9c235f017eeb74310 100644 (file)
--- a/modules/c32_apply_mapping
+++ b/modules/c32_apply_mapping
@@ -6,7 +6,7 @@ Files:
 lib/c32_apply_mapping.c
 
 Depends-on:
-uchar
+uchar-h
 towctrans
 
 configure.ac:

diff --git a/modules/c32_apply_type_test b/modules/c32_apply_type_test
index 3477413f865a11e8ba71e1e644c727db87a7a464..66194410422e9ddf8e81011b91bd6fdf1a27d66c 100644 (file)
--- a/modules/c32_apply_type_test
+++ b/modules/c32_apply_type_test
@@ -6,7 +6,7 @@ Files:
 lib/c32_apply_type_test.c
 
 Depends-on:
-uchar
+uchar-h
 iswctype
 
 configure.ac:

diff --git a/modules/c32_get_mapping b/modules/c32_get_mapping
index 140a92e99bd50690a1cf1ed818601df9aa82a650..de2a3b63deee362319af3704a611581ed83ca02d 100644 (file)
--- a/modules/c32_get_mapping
+++ b/modules/c32_get_mapping
@@ -6,7 +6,7 @@ Files:
 lib/c32_get_mapping.c
 
 Depends-on:
-uchar
+uchar-h
 wctrans
 c32tolower
 c32toupper

diff --git a/modules/c32_get_type_test b/modules/c32_get_type_test
index 4b54660714df6374f9c726a94ab0c0ee488e619e..e511bd51c769b2bf7a14bd6bb868573ce3b0c1af 100644 (file)
--- a/modules/c32_get_type_test
+++ b/modules/c32_get_type_test
@@ -6,7 +6,7 @@ Files:
 lib/c32_get_type_test.c
 
 Depends-on:
-uchar
+uchar-h
 wctype
 c32isalnum
 c32isalpha

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

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

diff --git a/modules/c32isblank b/modules/c32isblank
index f231f95600b58932c04ca023bfee5ae4504096b8..ca7463ca6264a307a640859278d20f8369f1e60b 100644 (file)
--- a/modules/c32isblank
+++ b/modules/c32isblank
@@ -14,7 +14,7 @@ m4/locale-zh.m4
 m4/codeset.m4
 
 Depends-on:
-uchar
+uchar-h
 wchar
 wctype-h
 iswblank

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

diff --git a/modules/c32isdigit b/modules/c32isdigit
index 986bf79e287789fac1b4bee9105498dc7a4fe879..4da5e9b11e0aca37d84e6d8d27491c20f2f874c5 100644 (file)
--- a/modules/c32isdigit
+++ b/modules/c32isdigit
@@ -14,7 +14,7 @@ m4/locale-zh.m4
 m4/codeset.m4
 
 Depends-on:
-uchar
+uchar-h
 wchar
 wctype-h
 iswdigit

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

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

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

diff --git a/modules/c32ispunct b/modules/c32ispunct
index 39c1286a78ba156acaadd40b7e3a7f74cc9c869d..46eb66b4bbe3f757a27bc3b361e81dbaa721ef13 100644 (file)
--- a/modules/c32ispunct
+++ b/modules/c32ispunct
@@ -15,7 +15,7 @@ m4/locale-zh.m4
 m4/codeset.m4
 
 Depends-on:
-uchar
+uchar-h
 wchar
 wctype-h
 iswpunct

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

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

diff --git a/modules/c32isxdigit b/modules/c32isxdigit
index a1c498fe3bf5f66b6cc9d1f63aa101c4519a05c7..1a95a30c469f9658285c32332800b33d48eab436 100644 (file)
--- a/modules/c32isxdigit
+++ b/modules/c32isxdigit
@@ -15,7 +15,7 @@ m4/locale-zh.m4
 m4/codeset.m4
 
 Depends-on:
-uchar
+uchar-h
 wchar
 wctype-h
 iswxdigit

diff --git a/modules/c32rtomb b/modules/c32rtomb
index 8331aa178a716f16f9c819f430f376c1f78c2d9b..1d7170164bcb27a8ba4a12bcf819769a5537bbd9 100644 (file)
--- a/modules/c32rtomb
+++ b/modules/c32rtomb
@@ -11,7 +11,7 @@ m4/locale-zh.m4
 m4/codeset.m4
 
 Depends-on:
-uchar
+uchar-h
 attribute       [test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1]
 wchar           [test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1]
 wcrtomb         [test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1]

diff --git a/modules/c32snrtombs b/modules/c32snrtombs
index e1bd41470d5e1733f1447252e5a66ab8f98c025b..b3d2f698c4a3559e45e3b053f263179c8ccb8af7 100644 (file)
--- a/modules/c32snrtombs
+++ b/modules/c32snrtombs
@@ -7,7 +7,7 @@ lib/wcsnrtombs-impl.h
 lib/c32srtombs-state.c
 
 Depends-on:
-uchar
+uchar-h
 wchar
 assert-h
 c32rtomb

diff --git a/modules/c32srtombs b/modules/c32srtombs
index ac1aaa7a0bba72fd1902cda463fd59c4a3f03465..b81cc882636d425c39fc4b029b777c8366a8d2d0 100644 (file)
--- a/modules/c32srtombs
+++ b/modules/c32srtombs
@@ -7,7 +7,7 @@ lib/wcsrtombs-impl.h
 lib/c32srtombs-state.c
 
 Depends-on:
-uchar
+uchar-h
 wchar
 assert-h
 c32rtomb

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

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

diff --git a/modules/c32tob b/modules/c32tob
index 6637b824923b2918e262a53c10f3313800e6f753..bbb3eedd1939d7da08c275b7638306b43ced5e82 100644 (file)
--- a/modules/c32tob
+++ b/modules/c32tob
@@ -11,7 +11,7 @@ m4/locale-zh.m4
 m4/codeset.m4
 
 Depends-on:
-uchar
+uchar-h
 mbszero
 c32rtomb
 wctob

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

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

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

diff --git a/modules/dfa b/modules/dfa
index 60b0086fc5d51f526465f520cda8e68c4014f972..aac8a9866af200d9ae4b49e6d708011e24605e0d 100644 (file)
--- a/modules/dfa
+++ b/modules/dfa
@@ -31,7 +31,7 @@ stdint-h
 stdio-h
 stdlib-h
 string-h
-uchar
+uchar-h
 # The lonesome_lower array requires ISO C 23 semantics for char32_t.
 # But uchar-c23 has a global effect, therefore leave it to each package
 # to enable it.

diff --git a/modules/fnmatch b/modules/fnmatch
index 4384e9b5dcfb0178a4a9f83607c2ec2a441f6e76..601038e084c510b24137ed16232992e310949fb6 100644 (file)
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -19,7 +19,7 @@ libc-config         [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1]
 stdbool-h           [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1]
 stdckdint-h         [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1]
 strnlen             [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1]
-uchar               [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1]
+uchar-h             [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1]
 memchr              [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1]
 memcmp              [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1]
 mempcpy             [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1]

diff --git a/modules/mbchar b/modules/mbchar
index 060db39482c1365dd1c5672cd1da45417cd6e10c..4554d04b524818b4b1f9e82254a8de847f5f9bee 100644 (file)
--- a/modules/mbchar
+++ b/modules/mbchar
@@ -10,7 +10,7 @@ Depends-on:
 extensions
 extern-inline
 stdbool-h
-uchar
+uchar-h
 c32isalnum
 c32isalpha
 c32isblank

diff --git a/modules/mbiter b/modules/mbiter
index 508dbf0d050b547d3e561432a6b08d7b518d455e..e2d2db6e950a002107f420de2e3a17bb1a730503 100644 (file)
--- a/modules/mbiter
+++ b/modules/mbiter
@@ -13,7 +13,7 @@ mbchar
 mbrtoc32
 mbsinit
 mbszero
-uchar
+uchar-h
 stdbool-h
 
 configure.ac:

diff --git a/modules/mbiterf b/modules/mbiterf
index 5b28b1b6852344f06772cd807ce94588e0f3f704..7393cedcf197f555ec2d464679fd16cb100aaed8 100644 (file)
--- a/modules/mbiterf
+++ b/modules/mbiterf
@@ -13,7 +13,7 @@ mbchar
 mbrtoc32
 mbsinit
 mbszero
-uchar
+uchar-h
 stdbool-h
 
 configure.ac:

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

diff --git a/modules/mbrtoc16 b/modules/mbrtoc16
index 19cc559fb6a3759fcfd7c56820af7732e2cdb1f9..c5a0a05122b0affa5f4b7872befd1a9c3168b5ff 100644 (file)
--- a/modules/mbrtoc16
+++ b/modules/mbrtoc16
@@ -12,7 +12,7 @@ m4/mbrtowc.m4
 m4/mbstate_t.m4
 
 Depends-on:
-uchar
+uchar-h
 uchar-c23       [test $HAVE_MBRTOC16 = 0 || test $REPLACE_MBRTOC16 = 1]
 mbrtoc32        [test $HAVE_MBRTOC16 = 0 || test $REPLACE_MBRTOC16 = 1]
 mbsinit         [test $HAVE_MBRTOC16 = 0 || test $REPLACE_MBRTOC16 = 1]

diff --git a/modules/mbrtoc32 b/modules/mbrtoc32
index 75c2b6fe45a4dcb1d7d47f7aa4231f75b3959c7e..ac2391dd79939a74f765181c548bc672def7d333 100644 (file)
--- a/modules/mbrtoc32
+++ b/modules/mbrtoc32
@@ -22,7 +22,7 @@ m4/threadlib.m4
 m4/visibility.m4
 
 Depends-on:
-uchar
+uchar-h
 attribute       [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
 c99             [{ test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1; } && test $REPLACE_MBSTATE_T = 0]
 hard-locale     [{ test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1; } && test $REPLACE_MBSTATE_T = 0]

diff --git a/modules/mbscasecmp b/modules/mbscasecmp
index 113df00173544560147c5f1932e51084dccb9db0..473fd018c900ac5cbfea50df2baf3d2f30aa95f8 100644 (file)
--- a/modules/mbscasecmp
+++ b/modules/mbscasecmp
@@ -9,7 +9,7 @@ c32tolower
 mbuiterf            [test "$GNULIB_MCEL_PREFER" != yes]
 stdlib-h
 string-h
-uchar
+uchar-h
 
 configure.ac:
 gl_STRING_MODULE_INDICATOR([mbscasecmp])

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

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

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

diff --git a/modules/mbswidth b/modules/mbswidth
index 3c2e17dc0625a2fab98e5e444ca7d8aa699c7e47..58e092d10d4e2f3b2161e529118982e2709463db 100644 (file)
--- a/modules/mbswidth
+++ b/modules/mbswidth
@@ -10,7 +10,7 @@ m4/mbswidth.m4
 
 Depends-on:
 wchar
-uchar
+uchar-h
 mbrtoc32
 mbsinit
 mbszero

diff --git a/modules/mbuiter b/modules/mbuiter
index ea29a5ca50457fb823bb2cb5ac9c315d6c7ed752..42c449c313282185829fb6e1dbd4cc1287054229 100644 (file)
--- a/modules/mbuiter
+++ b/modules/mbuiter
@@ -13,7 +13,7 @@ mbchar
 mbrtoc32
 mbsinit
 mbszero
-uchar
+uchar-h
 stdbool-h
 strnlen1
 

diff --git a/modules/mbuiterf b/modules/mbuiterf
index a659a8b9ceee2d799b57cb34a562f187324df83b..83307eb033ec6502b6132619c4362d8531ef30fa 100644 (file)
--- a/modules/mbuiterf
+++ b/modules/mbuiterf
@@ -13,7 +13,7 @@ mbchar
 mbrtoc32
 mbsinit
 mbszero
-uchar
+uchar-h
 stdbool-h
 strnlen1
 

diff --git a/modules/mcel b/modules/mcel
index f81bb5b048e1157b7b601ee3b7879f66f02596e2..356b08eb914fd06cc279cafec475c42024761192 100644 (file)
--- a/modules/mcel
+++ b/modules/mcel
@@ -12,7 +12,7 @@ extern-inline
 limits-h
 mbrtoc32
 stdbool-h
-uchar
+uchar-h
 verify
 
 configure.ac:

diff --git a/modules/posixcheck b/modules/posixcheck
index e069fc6dc1c363e2fca4bb2fc9f667169dd9c376..a7fd34fa0efa92036df2556c3f3b77276adfacfd 100644 (file)
--- a/modules/posixcheck
+++ b/modules/posixcheck
@@ -46,7 +46,7 @@ sys_wait-h
 termios-h
 threads-h
 time-h
-uchar
+uchar-h
 unistd
 utime-h
 utmp

diff --git a/modules/quotearg b/modules/quotearg
index c052d3458b21bd88cac32540c0bab2a987022077..e716268d700a28f5bd11254a594e3b8799ef8919 100644 (file)
--- a/modules/quotearg
+++ b/modules/quotearg
@@ -23,7 +23,7 @@ quotearg-simple
 localcharset
 stdbool-h
 stdint-h
-uchar
+uchar-h
 xalloc
 
 configure.ac:

diff --git a/modules/uchar b/modules/uchar
index cd31ab993ddc1146b1a8d762231153c359354e86..64722126912e176fa57be71172e988116038187c 100644 (file)
--- a/modules/uchar
+++ b/modules/uchar
@@ -1,103 +1,20 @@
 Description:
 A GNU-like <uchar.h>.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'uchar-h' instead.
+
 Files:
-lib/uchar.in.h
-m4/uchar_h.m4
-m4/stdint.m4
 
 Depends-on:
-gen-header
-include_next
-snippet/arg-nonnull
-snippet/c++defs
-snippet/warn-on-use
-extern-inline
-assert-h
-stdint-h
-wchar
-wctype-h
+uchar-h
 
 configure.ac:
-gl_UCHAR_H
-gl_UCHAR_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += uchar.h
-
-uchar.h: uchar.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/@''HAVE_UCHAR_H''@/$(HAVE_UCHAR_H)/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|@''NEXT_UCHAR_H''@|$(NEXT_UCHAR_H)|g' \
-             -e 's|@''CXX_HAS_CHAR8_TYPE''@|$(CXX_HAS_CHAR8_TYPE)|g' \
-             -e 's|@''CXX_HAS_UCHAR_TYPES''@|$(CXX_HAS_UCHAR_TYPES)|g' \
-             -e 's|@''SMALL_WCHAR_T''@|$(SMALL_WCHAR_T)|g' \
-             -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR8_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR8_T)|g' \
-             -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR16_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR16_T)|g' \
-             -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR32_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR32_T)|g' \
-             -e 's/@''GNULIB_BTOC32''@/$(GNULIB_BTOC32)/g' \
-             -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \
-             -e 's/@''GNULIB_C32ISALNUM''@/$(GNULIB_C32ISALNUM)/g' \
-             -e 's/@''GNULIB_C32ISALPHA''@/$(GNULIB_C32ISALPHA)/g' \
-             -e 's/@''GNULIB_C32ISBLANK''@/$(GNULIB_C32ISBLANK)/g' \
-             -e 's/@''GNULIB_C32ISCNTRL''@/$(GNULIB_C32ISCNTRL)/g' \
-             -e 's/@''GNULIB_C32ISDIGIT''@/$(GNULIB_C32ISDIGIT)/g' \
-             -e 's/@''GNULIB_C32ISGRAPH''@/$(GNULIB_C32ISGRAPH)/g' \
-             -e 's/@''GNULIB_C32ISLOWER''@/$(GNULIB_C32ISLOWER)/g' \
-             -e 's/@''GNULIB_C32ISPRINT''@/$(GNULIB_C32ISPRINT)/g' \
-             -e 's/@''GNULIB_C32ISPUNCT''@/$(GNULIB_C32ISPUNCT)/g' \
-             -e 's/@''GNULIB_C32ISSPACE''@/$(GNULIB_C32ISSPACE)/g' \
-             -e 's/@''GNULIB_C32ISUPPER''@/$(GNULIB_C32ISUPPER)/g' \
-             -e 's/@''GNULIB_C32ISXDIGIT''@/$(GNULIB_C32ISXDIGIT)/g' \
-             -e 's/@''GNULIB_C32TOLOWER''@/$(GNULIB_C32TOLOWER)/g' \
-             -e 's/@''GNULIB_C32TOUPPER''@/$(GNULIB_C32TOUPPER)/g' \
-             -e 's/@''GNULIB_C32WIDTH''@/$(GNULIB_C32WIDTH)/g' \
-             -e 's/@''GNULIB_C32RTOMB''@/$(GNULIB_C32RTOMB)/g' \
-             -e 's/@''GNULIB_C32SNRTOMBS''@/$(GNULIB_C32SNRTOMBS)/g' \
-             -e 's/@''GNULIB_C32SRTOMBS''@/$(GNULIB_C32SRTOMBS)/g' \
-             -e 's/@''GNULIB_C32STOMBS''@/$(GNULIB_C32STOMBS)/g' \
-             -e 's/@''GNULIB_C32SWIDTH''@/$(GNULIB_C32SWIDTH)/g' \
-             -e 's/@''GNULIB_C32TOB''@/$(GNULIB_C32TOB)/g' \
-             -e 's/@''GNULIB_C32_APPLY_MAPPING''@/$(GNULIB_C32_APPLY_MAPPING)/g' \
-             -e 's/@''GNULIB_C32_APPLY_TYPE_TEST''@/$(GNULIB_C32_APPLY_TYPE_TEST)/g' \
-             -e 's/@''GNULIB_C32_GET_MAPPING''@/$(GNULIB_C32_GET_MAPPING)/g' \
-             -e 's/@''GNULIB_C32_GET_TYPE_TEST''@/$(GNULIB_C32_GET_TYPE_TEST)/g' \
-             -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \
-             -e 's/@''GNULIB_ISWDIGIT''@/$(GNULIB_ISWDIGIT)/g' \
-             -e 's/@''GNULIB_ISWXDIGIT''@/$(GNULIB_ISWXDIGIT)/g' \
-             -e 's/@''GNULIB_MBRTOC16''@/$(GNULIB_MBRTOC16)/g' \
-             -e 's/@''GNULIB_MBRTOC32''@/$(GNULIB_MBRTOC32)/g' \
-             -e 's/@''GNULIB_MBSNRTOC32S''@/$(GNULIB_MBSNRTOC32S)/g' \
-             -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \
-             -e 's/@''GNULIB_MBSRTOC32S''@/$(GNULIB_MBSRTOC32S)/g' \
-             -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \
-             -e 's/@''GNULIB_MBSTOC32S''@/$(GNULIB_MBSTOC32S)/g' \
-             -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \
-             -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \
-             -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \
-             -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \
-             -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \
-             -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \
-             -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \
-             -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \
-             -e 's|@''HAVE_C32RTOMB''@|$(HAVE_C32RTOMB)|g' \
-             -e 's|@''HAVE_MBRTOC16''@|$(HAVE_MBRTOC16)|g' \
-             -e 's|@''HAVE_MBRTOC32''@|$(HAVE_MBRTOC32)|g' \
-             -e 's|@''REPLACE_C32RTOMB''@|$(REPLACE_C32RTOMB)|g' \
-             -e 's|@''REPLACE_MBRTOC16''@|$(REPLACE_MBRTOC16)|g' \
-             -e 's|@''REPLACE_MBRTOC32''@|$(REPLACE_MBRTOC32)|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)' \
-             $(srcdir)/uchar.in.h > $@-t
-       $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += uchar.h uchar.h-t
 
 Include:
 <uchar.h>
@@ -106,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-all

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

diff --git a/modules/uchar-h b/modules/uchar-h
new file mode 100644 (file)
index 0000000..cd31ab9
--- /dev/null
+++ b/modules/uchar-h
@@ -0,0 +1,109 @@
+Description:
+A GNU-like <uchar.h>.
+
+Files:
+lib/uchar.in.h
+m4/uchar_h.m4
+m4/stdint.m4
+
+Depends-on:
+gen-header
+include_next
+snippet/arg-nonnull
+snippet/c++defs
+snippet/warn-on-use
+extern-inline
+assert-h
+stdint-h
+wchar
+wctype-h
+
+configure.ac:
+gl_UCHAR_H
+gl_UCHAR_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += uchar.h
+
+uchar.h: uchar.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/@''HAVE_UCHAR_H''@/$(HAVE_UCHAR_H)/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|@''NEXT_UCHAR_H''@|$(NEXT_UCHAR_H)|g' \
+             -e 's|@''CXX_HAS_CHAR8_TYPE''@|$(CXX_HAS_CHAR8_TYPE)|g' \
+             -e 's|@''CXX_HAS_UCHAR_TYPES''@|$(CXX_HAS_UCHAR_TYPES)|g' \
+             -e 's|@''SMALL_WCHAR_T''@|$(SMALL_WCHAR_T)|g' \
+             -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR8_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR8_T)|g' \
+             -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR16_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR16_T)|g' \
+             -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR32_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR32_T)|g' \
+             -e 's/@''GNULIB_BTOC32''@/$(GNULIB_BTOC32)/g' \
+             -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \
+             -e 's/@''GNULIB_C32ISALNUM''@/$(GNULIB_C32ISALNUM)/g' \
+             -e 's/@''GNULIB_C32ISALPHA''@/$(GNULIB_C32ISALPHA)/g' \
+             -e 's/@''GNULIB_C32ISBLANK''@/$(GNULIB_C32ISBLANK)/g' \
+             -e 's/@''GNULIB_C32ISCNTRL''@/$(GNULIB_C32ISCNTRL)/g' \
+             -e 's/@''GNULIB_C32ISDIGIT''@/$(GNULIB_C32ISDIGIT)/g' \
+             -e 's/@''GNULIB_C32ISGRAPH''@/$(GNULIB_C32ISGRAPH)/g' \
+             -e 's/@''GNULIB_C32ISLOWER''@/$(GNULIB_C32ISLOWER)/g' \
+             -e 's/@''GNULIB_C32ISPRINT''@/$(GNULIB_C32ISPRINT)/g' \
+             -e 's/@''GNULIB_C32ISPUNCT''@/$(GNULIB_C32ISPUNCT)/g' \
+             -e 's/@''GNULIB_C32ISSPACE''@/$(GNULIB_C32ISSPACE)/g' \
+             -e 's/@''GNULIB_C32ISUPPER''@/$(GNULIB_C32ISUPPER)/g' \
+             -e 's/@''GNULIB_C32ISXDIGIT''@/$(GNULIB_C32ISXDIGIT)/g' \
+             -e 's/@''GNULIB_C32TOLOWER''@/$(GNULIB_C32TOLOWER)/g' \
+             -e 's/@''GNULIB_C32TOUPPER''@/$(GNULIB_C32TOUPPER)/g' \
+             -e 's/@''GNULIB_C32WIDTH''@/$(GNULIB_C32WIDTH)/g' \
+             -e 's/@''GNULIB_C32RTOMB''@/$(GNULIB_C32RTOMB)/g' \
+             -e 's/@''GNULIB_C32SNRTOMBS''@/$(GNULIB_C32SNRTOMBS)/g' \
+             -e 's/@''GNULIB_C32SRTOMBS''@/$(GNULIB_C32SRTOMBS)/g' \
+             -e 's/@''GNULIB_C32STOMBS''@/$(GNULIB_C32STOMBS)/g' \
+             -e 's/@''GNULIB_C32SWIDTH''@/$(GNULIB_C32SWIDTH)/g' \
+             -e 's/@''GNULIB_C32TOB''@/$(GNULIB_C32TOB)/g' \
+             -e 's/@''GNULIB_C32_APPLY_MAPPING''@/$(GNULIB_C32_APPLY_MAPPING)/g' \
+             -e 's/@''GNULIB_C32_APPLY_TYPE_TEST''@/$(GNULIB_C32_APPLY_TYPE_TEST)/g' \
+             -e 's/@''GNULIB_C32_GET_MAPPING''@/$(GNULIB_C32_GET_MAPPING)/g' \
+             -e 's/@''GNULIB_C32_GET_TYPE_TEST''@/$(GNULIB_C32_GET_TYPE_TEST)/g' \
+             -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \
+             -e 's/@''GNULIB_ISWDIGIT''@/$(GNULIB_ISWDIGIT)/g' \
+             -e 's/@''GNULIB_ISWXDIGIT''@/$(GNULIB_ISWXDIGIT)/g' \
+             -e 's/@''GNULIB_MBRTOC16''@/$(GNULIB_MBRTOC16)/g' \
+             -e 's/@''GNULIB_MBRTOC32''@/$(GNULIB_MBRTOC32)/g' \
+             -e 's/@''GNULIB_MBSNRTOC32S''@/$(GNULIB_MBSNRTOC32S)/g' \
+             -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \
+             -e 's/@''GNULIB_MBSRTOC32S''@/$(GNULIB_MBSRTOC32S)/g' \
+             -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \
+             -e 's/@''GNULIB_MBSTOC32S''@/$(GNULIB_MBSTOC32S)/g' \
+             -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \
+             -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \
+             -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \
+             -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \
+             -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \
+             -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \
+             -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \
+             -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \
+             -e 's|@''HAVE_C32RTOMB''@|$(HAVE_C32RTOMB)|g' \
+             -e 's|@''HAVE_MBRTOC16''@|$(HAVE_MBRTOC16)|g' \
+             -e 's|@''HAVE_MBRTOC32''@|$(HAVE_MBRTOC32)|g' \
+             -e 's|@''REPLACE_C32RTOMB''@|$(REPLACE_C32RTOMB)|g' \
+             -e 's|@''REPLACE_MBRTOC16''@|$(REPLACE_MBRTOC16)|g' \
+             -e 's|@''REPLACE_MBRTOC32''@|$(REPLACE_MBRTOC32)|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)' \
+             $(srcdir)/uchar.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += uchar.h uchar.h-t
+
+Include:
+<uchar.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all

diff --git a/modules/uchar-c++-tests b/modules/uchar-h-c++-tests
similarity index 72%
rename from modules/uchar-c++-tests
rename to modules/uchar-h-c++-tests
index bf6640f712a7fe1825cbe0dcef93bf1ed6c91741..52a4f9c7f20f326105b606f4efb19e090e71c80c 100644 (file)
--- a/modules/uchar-c++-tests
+++ b/modules/uchar-h-c++-tests
@@ -1,6 +1,6 @@
 Files:
-tests/test-uchar-c++.cc
-tests/test-uchar-c++2.cc
+tests/test-uchar-h-c++.cc
+tests/test-uchar-h-c++2.cc
 tests/signature.h
 
 Status:
@@ -33,11 +33,11 @@ gl_CONDITIONAL([CXX_HAVE_CUCHAR], [test $gl_cv_cxxheader_cuchar != no])
 
 Makefile.am:
 if ANSICXX
-TESTS += test-uchar-c++
-check_PROGRAMS += test-uchar-c++
-test_uchar_c___SOURCES = test-uchar-c++.cc
+TESTS += test-uchar-h-c++
+check_PROGRAMS += test-uchar-h-c++
+test_uchar_h_c___SOURCES = test-uchar-h-c++.cc
 if CXX_HAVE_CUCHAR
-test_uchar_c___SOURCES += test-uchar-c++2.cc
+test_uchar_h_c___SOURCES += test-uchar-h-c++2.cc
 endif
-test_uchar_c___LDADD = $(LDADD) $(LIBUNISTRING) $(MBRTOWC_LIB) $(LIBC32CONV)
+test_uchar_h_c___LDADD = $(LDADD) $(LIBUNISTRING) $(MBRTOWC_LIB) $(LIBC32CONV)
 endif

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

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

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

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

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