Rename module stdint to stdint-h.

* modules/stdint-h: Renamed from modules/stdint. * modules/stdint-h-tests: Renamed from modules/stdint-tests. * modules/stdint-h-c++-tests: Renamed from modules/stdint-c++-tests. * tests/test-stdint-h.c: Renamed from tests/test-stdint.c. * tests/test-stdint-h-c++.cc: Renamed from tests/test-stdint-c++.cc. * tests/test-stdint-h-c++2.cc: Renamed from tests/test-stdint-c++2.cc. * doc/posix-headers/stdint.texi: Update. * doc/gnulib-readme.texi: Update. * doc/gnulib.texi: Update. * modules/* (Depends-on): Update. * modules/stdint: New file.
2025-08-08 17:22:05 +03:00 · 2024-12-27 23:23:13 +01:00
parent 72b89433e6
commit 1450747216
233 changed files with 351 additions and 311 deletions
--- a/15
+++ b/15
@@ -1,3 +1,18 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+	Rename module stdint to stdint-h.
+	* modules/stdint-h: Renamed from modules/stdint.
+	* modules/stdint-h-tests: Renamed from modules/stdint-tests.
+	* modules/stdint-h-c++-tests: Renamed from modules/stdint-c++-tests.
+	* tests/test-stdint-h.c: Renamed from tests/test-stdint.c.
+	* tests/test-stdint-h-c++.cc: Renamed from tests/test-stdint-c++.cc.
+	* tests/test-stdint-h-c++2.cc: Renamed from tests/test-stdint-c++2.cc.
+	* doc/posix-headers/stdint.texi: Update.
+	* doc/gnulib-readme.texi: Update.
+	* doc/gnulib.texi: Update.
+	* modules/* (Depends-on): Update.
+	* modules/stdint: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>

 	Rename module stddef to stddef-h.
--- a/doc/gnulib-readme.texi
+++ b/doc/gnulib-readme.texi
@@ -374,8 +374,8 @@ it directly, preferring plain @code{bool} via the

@item
@code{<stdint.h>},
-@mindex stdint
-assuming the @code{stdint} module is used.
+@mindex stdint-h
+assuming the @code{stdint-h} module is used.
@xref{stdint.h}.

@item
--- a/doc/gnulib.texi
+++ b/doc/gnulib.texi
@@ -828,7 +828,7 @@ Git, however, doesn't address the distribution issue.  When a package
 either has to put a comment into @file{foobar/autogen.sh} saying
 ``Attention! This doesn't work with a pristine Gnulib, you need this
 and that patch after checking out Gnulib,'' or it has to use the
-@samp{--avoid=stdint} option and provide the modified @code{stdint}
+@samp{--avoid=stdint-h} option and provide the modified @code{stdint-h}
 module in a different directory.

 The @option{--local-dir} option to @command{gnulib-tool} solves this
--- a/doc/posix-headers/stdint.texi
+++ b/doc/posix-headers/stdint.texi
@@ -3,8 +3,8 @@

 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stdint.h.html}

-Gnulib module: stdint
-@mindex stdint
+Gnulib module: stdint-h
+@mindex stdint-h

 Portability problems fixed by Gnulib:
@itemize
@@ -69,7 +69,7 @@ To work around these problems, compute the value of expressions like
@code{#if}-time.
@end itemize

-The @code{stdint} module uses @code{#include_next}.  If you wish to install
+The @code{stdint-h} module uses @code{#include_next}.  If you wish to install
 the generated stdint.h file under another name, typically in order to
 be able to use some of the types defined by stdint.h in your public
 header file, you could use the following Makefile.am-snippet:
--- a/modules/alignalloc
+++ b/modules/alignalloc
@@ -14,7 +14,7 @@ extern-inline
 idx
 posix_memalign
 stdckdint-h
-stdint
+stdint-h

 configure.ac:
 gl_ALIGNALLOC
--- a/modules/alignalloc-tests
+++ b/modules/alignalloc-tests
@@ -5,7 +5,7 @@ tests/macros.h

 Depends-on:
 intprops
-stdint
+stdint-h

 configure.ac:

--- a/modules/alignasof-tests
+++ b/modules/alignasof-tests
@@ -4,7 +4,7 @@ tests/macros.h

 Depends-on:
 assert-h
-stdint
+stdint-h

 configure.ac:

--- a/modules/aligned-malloc
+++ b/modules/aligned-malloc
@@ -6,7 +6,7 @@ lib/aligned-malloc.h
 m4/malloc-align.m4

 Depends-on:
-stdint
+stdint-h
 posix_memalign
 aligned_alloc
 memalign
--- a/modules/aligned_alloc-tests
+++ b/modules/aligned_alloc-tests
@@ -3,7 +3,7 @@ tests/test-aligned_alloc.c
 tests/macros.h

 Depends-on:
-stdint
+stdint-h

 configure.ac:

--- a/modules/alignof-tests
+++ b/modules/alignof-tests
@@ -3,7 +3,7 @@ tests/test-alignof.c

 Depends-on:
 assert-h
-stdint
+stdint-h

 configure.ac:

--- a/modules/areadlink-with-size
+++ b/modules/areadlink-with-size
@@ -10,7 +10,7 @@ free-posix
 limits-h
 readlink
 ssize_t
-stdint
+stdint-h
 unistd

 configure.ac:
--- a/modules/areadlinkat-with-size
+++ b/modules/areadlinkat-with-size
@@ -8,7 +8,7 @@ lib/at-func.c

 Depends-on:
 areadlink-with-size
-stdint
+stdint-h
 readlinkat
 at-internal
 errno-h
--- a/modules/array-list
+++ b/modules/array-list
@@ -7,7 +7,7 @@ lib/gl_array_list.c

 Depends-on:
 list
-stdint
+stdint-h
 xsize

 configure.ac:
--- a/modules/array-map
+++ b/modules/array-map
@@ -7,7 +7,7 @@ lib/gl_array_map.c

 Depends-on:
 map
-stdint
+stdint-h
 xsize

 configure.ac:
--- a/modules/array-set
+++ b/modules/array-set
@@ -7,7 +7,7 @@ lib/gl_array_set.c

 Depends-on:
 set
-stdint
+stdint-h
 xsize

 configure.ac:
--- a/modules/avltreehash-list
+++ b/modules/avltreehash-list
@@ -18,7 +18,7 @@ Depends-on:
 builtin-expect
 list
 avltree-oset
-stdint
+stdint-h
 xsize

 configure.ac:
--- a/modules/backup-rename
+++ b/modules/backup-rename
@@ -23,7 +23,7 @@ readdir
 renameatu
 stdbool-h
 stdckdint-h
-stdint
+stdint-h
 xalloc-oversized

 configure.ac:
--- a/modules/backupfile
+++ b/modules/backupfile
@@ -23,7 +23,7 @@ readdir
 renameatu
 stdbool-h
 stdckdint-h
-stdint
+stdint-h
 xalloc-die

 configure.ac:
--- a/modules/bitrotate
+++ b/modules/bitrotate
@@ -7,7 +7,7 @@ lib/bitrotate.c

 Depends-on:
 extern-inline
-stdint
+stdint-h

 configure.ac:

--- a/modules/byteswap
+++ b/modules/byteswap
@@ -10,7 +10,7 @@ Depends-on:
 gen-header
 extern-inline           [$GL_GENERATE_BYTESWAP_H]
 stdbool-h               [$GL_GENERATE_BYTESWAP_H]
-stdint                  [$GL_GENERATE_BYTESWAP_H]
+stdint-h                [$GL_GENERATE_BYTESWAP_H]

 configure.ac:
 gl_BYTESWAP
--- a/modules/byteswap-tests
+++ b/modules/byteswap-tests
@@ -3,7 +3,7 @@ tests/test-byteswap.c
 tests/macros.h

 Depends-on:
-stdint
+stdint-h
 byteswap-c++-tests

 configure.ac:
--- a/modules/c-snprintf
+++ b/modules/c-snprintf
@@ -6,7 +6,7 @@ lib/c-snprintf.h
 lib/c-snprintf.c

 Depends-on:
-stdint
+stdint-h
 stdio
 c-vsnzprintf

--- a/modules/c-snzprintf
+++ b/modules/c-snzprintf
@@ -7,7 +7,7 @@ lib/c-snprintf.h
 lib/c-snzprintf.c

 Depends-on:
-stdint
+stdint-h
 stdio
 c-vasnprintf

--- a/modules/c-vasnprintf
+++ b/modules/c-vasnprintf
@@ -24,7 +24,7 @@ Depends-on:
 assert-h
 attribute
 limits-h
-stdint
+stdint-h
 stdio
 mixin/printf-posix
 free-posix
--- a/modules/c-vasprintf
+++ b/modules/c-vasprintf
@@ -7,7 +7,7 @@ lib/c-asprintf.c
 lib/c-vasprintf.c

 Depends-on:
-stdint
+stdint-h
 stdio
 c-vasnprintf

--- a/modules/c-vaszprintf
+++ b/modules/c-vaszprintf
@@ -7,7 +7,7 @@ lib/c-aszprintf.c
 lib/c-vaszprintf.c

 Depends-on:
-stdint
+stdint-h
 stdio
 c-vasnprintf

--- a/modules/c-vsnprintf
+++ b/modules/c-vsnprintf
@@ -7,7 +7,7 @@ lib/c-vsnprintf.h
 lib/c-vsnprintf.c

 Depends-on:
-stdint
+stdint-h
 stdio
 c-vsnzprintf

--- a/modules/c-vsnzprintf
+++ b/modules/c-vsnzprintf
@@ -7,7 +7,7 @@ lib/c-vsnprintf.h
 lib/c-vsnzprintf.c

 Depends-on:
-stdint
+stdint-h
 stdio
 c-vasnprintf

--- a/modules/call_once-tests
+++ b/modules/call_once-tests
@@ -7,7 +7,7 @@ Depends-on:
 thrd
 lock
 mtx
-stdint
+stdint-h

 configure.ac:
 AC_CHECK_DECLS_ONCE([alarm])
--- a/modules/calloc-gnu-tests
+++ b/modules/calloc-gnu-tests
@@ -3,7 +3,7 @@ tests/test-calloc-gnu.c
 tests/macros.h

 Depends-on:
-stdint
+stdint-h

 configure.ac:

--- a/modules/calloc-posix-tests
+++ b/modules/calloc-posix-tests
@@ -3,7 +3,7 @@ tests/test-calloc-posix.c
 tests/macros.h

 Depends-on:
-stdint
+stdint-h

 configure.ac:

--- a/modules/carray-list
+++ b/modules/carray-list
@@ -7,7 +7,7 @@ lib/gl_carray_list.c

 Depends-on:
 list
-stdint
+stdint-h
 xsize

 configure.ac:
--- a/modules/ceil-tests
+++ b/modules/ceil-tests
@@ -11,7 +11,7 @@ float-h
 isnand-nolibm
 nan
 stdbool-h
-stdint
+stdint-h

 configure.ac:

--- a/modules/ceilf-tests
+++ b/modules/ceilf-tests
@@ -11,7 +11,7 @@ float-h
 isnanf-nolibm
 nan
 stdbool-h
-stdint
+stdint-h

 configure.ac:

--- a/modules/crc
+++ b/modules/crc
@@ -9,7 +9,7 @@ m4/crc.m4
 m4/build-cc.m4

 Depends-on:
-stdint
+stdint-h
 endian

 configure.ac:
--- a/modules/crc-x86_64
+++ b/modules/crc-x86_64
@@ -7,7 +7,7 @@ lib/crc-x86_64-pclmul.c
 m4/crc-x86_64.m4

 Depends-on:
-stdint
+stdint-h
 crc

 configure.ac:
--- a/modules/crypto/arcfour
+++ b/modules/crypto/arcfour
@@ -6,7 +6,7 @@ lib/arcfour.h
 lib/arcfour.c

 Depends-on:
-stdint
+stdint-h

 configure.ac:
 AC_REQUIRE([AC_C_RESTRICT])
--- a/modules/crypto/arctwo
+++ b/modules/crypto/arctwo
@@ -7,7 +7,7 @@ lib/arctwo.c
 m4/arctwo.m4

 Depends-on:
-stdint
+stdint-h
 bitrotate

 configure.ac:
--- a/modules/crypto/des
+++ b/modules/crypto/des
@@ -6,7 +6,7 @@ lib/des.c
 lib/des.h

 Depends-on:
-stdint
+stdint-h
 stdbool-h
 memcmp

--- a/modules/crypto/md4-buffer
+++ b/modules/crypto/md4-buffer
@@ -9,7 +9,7 @@ m4/md4.m4
 Depends-on:
 alignasof
 byteswap
-stdint
+stdint-h

 configure.ac:
 AC_REQUIRE([AC_C_RESTRICT])
--- a/modules/crypto/md5-buffer
+++ b/modules/crypto/md5-buffer
@@ -13,7 +13,7 @@ alignasof
 byteswap
 c99
 extern-inline
-stdint
+stdint-h

 configure.ac:
 AC_REQUIRE([AC_C_RESTRICT])
--- a/modules/crypto/rijndael
+++ b/modules/crypto/rijndael
@@ -8,7 +8,7 @@ lib/rijndael-api-fst.c
 lib/rijndael-api-fst.h

 Depends-on:
-stdint
+stdint-h

 configure.ac:
 AC_REQUIRE([AC_C_RESTRICT])
--- a/modules/crypto/sha1-buffer
+++ b/modules/crypto/sha1-buffer
@@ -13,7 +13,7 @@ alignasof
 byteswap
 c99
 extern-inline
-stdint
+stdint-h

 configure.ac:
 AC_REQUIRE([AC_C_RESTRICT])
--- a/modules/crypto/sha256-buffer
+++ b/modules/crypto/sha256-buffer
@@ -13,7 +13,7 @@ alignasof
 byteswap
 c99
 extern-inline
-stdint
+stdint-h

 configure.ac:
 AC_REQUIRE([AC_C_RESTRICT])
--- a/modules/crypto/sha512-buffer
+++ b/modules/crypto/sha512-buffer
@@ -13,7 +13,7 @@ alignasof
 byteswap
 c99
 extern-inline
-stdint
+stdint-h
 u64

 configure.ac:
--- a/modules/crypto/sm3-buffer
+++ b/modules/crypto/sm3-buffer
@@ -11,7 +11,7 @@ alignasof
 byteswap
 c99
 extern-inline
-stdint
+stdint-h

 configure.ac:
 gl_SM3
--- a/modules/cycle-check
+++ b/modules/cycle-check
@@ -11,7 +11,7 @@ assure
 dev-ino
 same-inode
 stdbool-h
-stdint
+stdint-h

 configure.ac:
 gl_CYCLE_CHECK
--- a/modules/dfa
+++ b/modules/dfa
@@ -27,7 +27,7 @@ mbszero
 regex
 stdbool-h
 stddef-h
-stdint
+stdint-h
 stdio
 stdlib
 string
--- a/modules/di-set
+++ b/modules/di-set
@@ -8,7 +8,7 @@ lib/di-set.h
 Depends-on:
 ino-map
 hash
-stdint
+stdint-h

 configure.ac:

--- a/modules/dprintf-posix-tests
+++ b/modules/dprintf-posix-tests
@@ -12,7 +12,7 @@ tests/macros.h

 Depends-on:
 stdbool-h
-stdint
+stdint-h
 get-rusage-as

 configure.ac:
--- a/modules/dzprintf-gnu-tests
+++ b/modules/dzprintf-gnu-tests
@@ -6,7 +6,7 @@ tests/test-printf-gnu.output
 tests/macros.h

 Depends-on:
-stdint
+stdint-h

 configure.ac:

--- a/modules/dzprintf-posix-tests
+++ b/modules/dzprintf-posix-tests
@@ -7,7 +7,7 @@ tests/infinity.h
 tests/macros.h

 Depends-on:
-stdint
+stdint-h

 configure.ac:

--- a/modules/endian
+++ b/modules/endian
@@ -11,7 +11,7 @@ gen-header
 include_next
 extern-inline           [$GL_GENERATE_ENDIAN_H && test $ENDIAN_H_JUST_MISSING_STDINT = 0]
 byteswap                [$GL_GENERATE_ENDIAN_H && test $ENDIAN_H_JUST_MISSING_STDINT = 0]
-stdint                  [$GL_GENERATE_ENDIAN_H]
+stdint-h                [$GL_GENERATE_ENDIAN_H]

 configure.ac:
 gl_ENDIAN_H
--- a/modules/endian-tests
+++ b/modules/endian-tests
@@ -4,7 +4,7 @@ tests/macros.h

 Depends-on:
 assert-h
-stdint
+stdint-h
 endian-c++-tests

 configure.ac:
--- a/modules/execute-tests
+++ b/modules/execute-tests
@@ -16,7 +16,7 @@ mkdir
 msvc-inval
 read-file
 stdbool-h
-stdint
+stdint-h
 unistd

 configure.ac:
--- a/modules/explicit_bzero-tests
+++ b/modules/explicit_bzero-tests
@@ -4,7 +4,7 @@ tests/signature.h
 tests/macros.h

 Depends-on:
-stdint
+stdint-h
 vma-iter

 configure.ac:
--- a/modules/floor-tests
+++ b/modules/floor-tests
@@ -11,7 +11,7 @@ float-h
 isnand-nolibm
 nan
 stdbool-h
-stdint
+stdint-h

 configure.ac:

--- a/modules/floorf-tests
+++ b/modules/floorf-tests
@@ -11,7 +11,7 @@ float-h
 isnanf-nolibm
 nan
 stdbool-h
-stdint
+stdint-h

 configure.ac:

--- a/modules/fprintf-posix-tests
+++ b/modules/fprintf-posix-tests
@@ -14,7 +14,7 @@ tests/macros.h

 Depends-on:
 stdbool-h
-stdint
+stdint-h
 get-rusage-as

 configure.ac:
--- a/modules/fstrcmp
+++ b/modules/fstrcmp
@@ -11,7 +11,7 @@ diffseq
 once
 tls
 minmax
-stdint
+stdint-h
 xalloc

 configure.ac:
--- a/modules/fsusage
+++ b/modules/fsusage
@@ -10,7 +10,7 @@ Depends-on:
 c99
 largefile
 stdbool-h
-stdint
+stdint-h

 configure.ac:
 gl_FSUSAGE
--- a/modules/fts
+++ b/modules/fts
@@ -36,7 +36,7 @@ readdir
 realloc-posix
 stdbool-h
 stddef-h
-stdint
+stdint-h

 configure.ac:
 gl_FUNC_FTS
--- a/modules/fzprintf-posix-tests
+++ b/modules/fzprintf-posix-tests
@@ -7,7 +7,7 @@ tests/infinity.h
 tests/macros.h

 Depends-on:
-stdint
+stdint-h

 configure.ac:

--- a/modules/get-rusage-as
+++ b/modules/get-rusage-as
@@ -7,7 +7,7 @@ lib/get-rusage-as.c
 m4/mmap-anon.m4

 Depends-on:
-stdint
+stdint-h
 unistd
 extensions
 getpagesize
--- a/modules/get-rusage-data
+++ b/modules/get-rusage-data
@@ -7,7 +7,7 @@ lib/get-rusage-data.c
 m4/mmap-anon.m4

 Depends-on:
-stdint
+stdint-h
 unistd
 extensions
 getpagesize
--- a/modules/getdelim
+++ b/modules/getdelim
@@ -9,7 +9,7 @@ Depends-on:
 stdio
 extensions
 limits-h        [test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1]
-stdint          [test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1]
+stdint-h        [test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1]
 errno-h         [test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1]

 configure.ac:
--- a/modules/getgroups
+++ b/modules/getgroups
@@ -9,7 +9,7 @@ Depends-on:
 unistd
 free-posix      [test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1]
 malloc-posix    [test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1]
-stdint          [test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1]
+stdint-h        [test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1]

 configure.ac:
 gl_FUNC_GETGROUPS
--- a/modules/getndelim2
+++ b/modules/getndelim2
@@ -11,7 +11,7 @@ Depends-on:
 limits-h
 ssize_t
 stdbool-h
-stdint
+stdint-h
 freadptr
 freadseek
 memchr2
--- a/modules/getpayload
+++ b/modules/getpayload
@@ -10,7 +10,7 @@ Depends-on:
 math-h
 extensions
 float-h         [test $HAVE_GETPAYLOAD = 0 || test $REPLACE_GETPAYLOAD = 1]
-stdint          [test $HAVE_GETPAYLOAD = 0 || test $REPLACE_GETPAYLOAD = 1]
+stdint-h        [test $HAVE_GETPAYLOAD = 0 || test $REPLACE_GETPAYLOAD = 1]
 isnand          [test $HAVE_GETPAYLOAD = 0 || test $REPLACE_GETPAYLOAD = 1]

 configure.ac:
--- a/modules/getpayloadf
+++ b/modules/getpayloadf
@@ -10,7 +10,7 @@ Depends-on:
 math-h
 extensions
 float-h         [test $HAVE_GETPAYLOADF = 0 || test $REPLACE_GETPAYLOADF = 1]
-stdint          [test $HAVE_GETPAYLOADF = 0 || test $REPLACE_GETPAYLOADF = 1]
+stdint-h        [test $HAVE_GETPAYLOADF = 0 || test $REPLACE_GETPAYLOADF = 1]
 isnanf          [test $HAVE_GETPAYLOADF = 0 || test $REPLACE_GETPAYLOADF = 1]

 configure.ac:
--- a/modules/getpayloadl
+++ b/modules/getpayloadl
@@ -12,7 +12,7 @@ math-h
 extensions
 getpayload      [{ test $HAVE_GETPAYLOADL = 0 || test $REPLACE_GETPAYLOADL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1]
 float-h         [{ test $HAVE_GETPAYLOADL = 0 || test $REPLACE_GETPAYLOADL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
-stdint          [{ test $HAVE_GETPAYLOADL = 0 || test $REPLACE_GETPAYLOADL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
+stdint-h        [{ test $HAVE_GETPAYLOADL = 0 || test $REPLACE_GETPAYLOADL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 isnanl          [{ test $HAVE_GETPAYLOADL = 0 || test $REPLACE_GETPAYLOADL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 snan            [{ test $HAVE_GETPAYLOADL = 0 || test $REPLACE_GETPAYLOADL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]

--- a/modules/getrusage
+++ b/modules/getrusage
@@ -7,7 +7,7 @@ m4/getrusage.m4

 Depends-on:
 sys_resource
-stdint          [test $HAVE_GETRUSAGE = 0]
+stdint-h        [test $HAVE_GETRUSAGE = 0]

 configure.ac:
 gl_FUNC_GETRUSAGE
--- a/modules/git-merge-changelog
+++ b/modules/git-merge-changelog
@@ -9,7 +9,7 @@ c99
 getopt-gnu
 idx
 stdbool-h
-stdint
+stdint-h
 stdlib
 error
 read-file
--- a/modules/glob
+++ b/modules/glob
@@ -30,7 +30,7 @@ readdir                       [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
 glibc-internal/scratch_buffer [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
 stdbool-h                     [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
 stdckdint-h                   [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
-stdint                        [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
+stdint-h                      [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
 strdup                        [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
 unistd                        [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
 malloc-posix                  [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
--- a/modules/hamt
+++ b/modules/hamt
@@ -11,7 +11,7 @@ extern-inline
 flexmember
 inttypes-h-incomplete
 stdbool-h
-stdint
+stdint-h
 verify
 xalloc

--- a/modules/hash
+++ b/modules/hash
@@ -11,7 +11,7 @@ calloc-posix
 free-posix
 malloc-posix
 stdbool-h
-stdint
+stdint-h
 xalloc-oversized

 configure.ac:
--- a/modules/hash-map
+++ b/modules/hash-map
@@ -10,7 +10,7 @@ lib/gl_anyhash_primes.h

 Depends-on:
 map
-stdint
+stdint-h
 xsize
 c99

--- a/modules/hash-set
+++ b/modules/hash-set
@@ -10,7 +10,7 @@ lib/gl_anyhash_primes.h

 Depends-on:
 set
-stdint
+stdint-h
 xsize
 c99

--- a/modules/htonl-tests
+++ b/modules/htonl-tests
@@ -4,7 +4,7 @@ tests/macros.h

 Depends-on:
 endian
-stdint
+stdint-h

 configure.ac:

--- a/modules/human
+++ b/modules/human
@@ -15,7 +15,7 @@ localeconv
 memmove
 xstrtoumax
 stdbool-h
-stdint
+stdint-h

 configure.ac:
 gl_HUMAN
--- a/modules/ialloc
+++ b/modules/ialloc
@@ -12,7 +12,7 @@ idx
 malloc-gnu
 realloc-posix
 reallocarray
-stdint
+stdint-h

 configure.ac:

--- a/modules/iconv_open
+++ b/modules/iconv_open
@@ -19,7 +19,7 @@ iconv-h
 iconv
 c-ctype           [test $REPLACE_ICONV_OPEN = 1]
 c-strcase         [test $REPLACE_ICONV_OPEN = 1]
-stdint            [test $REPLACE_ICONV_UTF = 1]
+stdint-h          [test $REPLACE_ICONV_UTF = 1]
 unistr/u8-mbtoucr [test $REPLACE_ICONV_UTF = 1]
 unistr/u8-uctomb  [test $REPLACE_ICONV_UTF = 1]

--- a/modules/idx
+++ b/modules/idx
@@ -5,7 +5,7 @@ Files:
 lib/idx.h

 Depends-on:
-stdint
+stdint-h

 configure.ac:

--- a/modules/immutable
+++ b/modules/immutable
@@ -10,7 +10,7 @@ m4/mmap-anon.m4
 m4/nocrash.m4

 Depends-on:
-stdint
+stdint-h
 pathmax
 open
 once
--- a/modules/inttostr
+++ b/modules/inttostr
@@ -13,7 +13,7 @@ m4/inttostr.m4

 Depends-on:
 intprops
-stdint
+stdint-h

 configure.ac:
 gl_INTTOSTR
--- a/modules/inttypes-h-incomplete
+++ b/modules/inttypes-h-incomplete
@@ -12,7 +12,7 @@ multiarch
 snippet/arg-nonnull
 snippet/c++defs
 snippet/warn-on-use
-stdint
+stdint-h

 configure.ac:
 gl_INTTYPES_INCOMPLETE
--- a/modules/jit/cache
+++ b/modules/jit/cache
@@ -6,7 +6,7 @@ lib/jit/cache.h
 m4/valgrind-helper.m4

 Depends-on:
-stdint
+stdint-h

 configure.ac:
 gl_VALGRIND_HELPER
--- a/modules/jit/cache-tests
+++ b/modules/jit/cache-tests
@@ -12,7 +12,7 @@ Depends-on:
 clean-temp-simple
 getpagesize
 host-cpu-c-abi
-stdint
+stdint-h
 xalloc

 configure.ac:
--- a/modules/linkedhash-list
+++ b/modules/linkedhash-list
@@ -12,7 +12,7 @@ lib/gl_anylinked_list2.h

 Depends-on:
 list
-stdint
+stdint-h
 xsize

 configure.ac:
--- a/modules/linkedhash-map
+++ b/modules/linkedhash-map
@@ -10,7 +10,7 @@ lib/gl_anyhash_primes.h

 Depends-on:
 map
-stdint
+stdint-h
 xsize
 c99

--- a/modules/linkedhash-set
+++ b/modules/linkedhash-set
@@ -10,7 +10,7 @@ lib/gl_anyhash_primes.h

 Depends-on:
 set
-stdint
+stdint-h
 xsize
 c99

--- a/modules/lock-tests
+++ b/modules/lock-tests
@@ -7,7 +7,7 @@ m4/semaphore.m4

 Depends-on:
 thread
-stdint
+stdint-h
 once
 usleep
 yield
--- a/modules/malloc-gnu-tests
+++ b/modules/malloc-gnu-tests
@@ -3,7 +3,7 @@ tests/test-malloc-gnu.c
 tests/macros.h

 Depends-on:
-stdint
+stdint-h

 configure.ac:

--- a/modules/malloc-posix-tests
+++ b/modules/malloc-posix-tests
@@ -3,7 +3,7 @@ tests/test-malloc-posix.c
 tests/macros.h

 Depends-on:
-stdint
+stdint-h

 configure.ac:

--- a/modules/malloca
+++ b/modules/malloca
@@ -13,7 +13,7 @@ assert-h
 extensions-aix
 idx
 stdckdint-h
-stdint
+stdint-h
 xalloc-oversized

 configure.ac:
--- a/modules/mbrtowc
+++ b/modules/mbrtowc
@@ -23,7 +23,7 @@ Depends-on:
 wchar
 extensions
 attribute       [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
-stdint          [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
+stdint-h        [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
 hard-locale     [{ test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; } && test $REPLACE_MBSTATE_T = 0]
 mbsinit         [{ test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; } && test $REPLACE_MBSTATE_T = 0]
 assert-h        [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
--- a/modules/memalign-tests
+++ b/modules/memalign-tests
@@ -3,7 +3,7 @@ tests/test-memalign.c
 tests/macros.h

 Depends-on:
-stdint
+stdint-h

 configure.ac:

--- a/modules/memchr2
+++ b/modules/memchr2
@@ -7,7 +7,7 @@ lib/memchr2.c
 lib/memchr2.valgrind

 Depends-on:
-stdint
+stdint-h
 memchr

 configure.ac:
--- a/modules/memcmp
+++ b/modules/memcmp
@@ -12,7 +12,7 @@ lib/memcmp.c
 m4/memcmp.m4

 Depends-on:
-stdint          [test $gl_func_memcmp = no]
+stdint-h        [test $gl_func_memcmp = no]

 configure.ac:
 gl_FUNC_MEMCMP
--- a/modules/memmem-simple
+++ b/modules/memmem-simple
@@ -10,7 +10,7 @@ Depends-on:
 builtin-expect
 extensions
 string
-stdint
+stdint-h
 memchr
 memcmp

--- a/Show More
+++ b/Show More