Rename module stdckdint to stdckdint-h.

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

diff --git a/ChangeLog b/ChangeLog
index ad9d1c25a76c39cb7bbb3faede752f2c993fe314..a910bc094dc4ca9783e499eb56aab55ffacaa76d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+       Rename module stdckdint to stdckdint-h.
+       * modules/stdckdint-h: Renamed from modules/stdckdint.
+       * modules/stdckdint-h-tests: Renamed from modules/stdckdint-tests.
+       * modules/stdckdint-h-c++-tests: Renamed from
+       modules/stdckdint-c++-tests.
+       * tests/test-stdckdint-h.c: Renamed from tests/test-stdckdint.c.
+       * tests/test-stdckdint-h-c++.cc: Renamed from
+       tests/test-stdckdint-c++.cc.
+       * doc/posix-headers/stdckdint.texi: Update.
+       * doc/intprops.texi: Update.
+       * modules/* (Depends-on): Update.
+       * modules/stdckdint: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
        Rename module stdbool to stdbool-h.

diff --git a/doc/intprops.texi b/doc/intprops.texi
index d87071fc372e396f67638cd4710d8ba456c0c0f2..023d106532e713e8a55d49e3a67becc3aaf172a1 100644 (file)
--- a/doc/intprops.texi
+++ b/doc/intprops.texi
@@ -341,9 +341,9 @@ low-order bits are the mathematically-correct product.  See above for
 restrictions.
 @end table
 
-@mindex stdckdint
+@mindex stdckdint-h
 If your code includes @code{<intprops.h>} only for these @code{_WRAPV}
-macros, you may prefer to use Gnulib's @code{stdckdint} module
+macros, you may prefer to use Gnulib's @code{stdckdint-h} module
 instead, as it supports similar macros that were standardized in C23
 and are therefore independent of Gnulib if your code can assume C23 or
 later.  @xref{stdckdint.h}.

diff --git a/doc/posix-headers/stdckdint.texi b/doc/posix-headers/stdckdint.texi
index 87e8c0bf9c1212ccbacc68d8c44d0781fc48a7c6..6c7068ec7311971f5dca931d11dc33de0ffac938 100644 (file)
--- a/doc/posix-headers/stdckdint.texi
+++ b/doc/posix-headers/stdckdint.texi
@@ -6,8 +6,8 @@ ISO draft C23
 (@url{https://www.open-std.org/jtc1/sc22/wg14/www/docs/n3220.pdf})
 section 7.20.
 
-Gnulib module: stdckdint
-@mindex stdckdint
+Gnulib module: stdckdint-h
+@mindex stdckdint-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/modules/alignalloc b/modules/alignalloc
index 400ab29182797f8fd503f193d2ebc9bba74fbc64..7f1aac45c54f012f2029dca00b305e1cd46bac30 100644 (file)
--- a/modules/alignalloc
+++ b/modules/alignalloc
@@ -13,7 +13,7 @@ extensions
 extern-inline
 idx
 posix_memalign
-stdckdint
+stdckdint-h
 stdint
 
 configure.ac:

diff --git a/modules/backup-rename b/modules/backup-rename
index 0e2ddfb27c510275ad1418ff6ee640f83c2f24f1..286756277aff4e6bd8eaaac65f0c4ebb1a938c51 100644 (file)
--- a/modules/backup-rename
+++ b/modules/backup-rename
@@ -22,7 +22,7 @@ opendirat
 readdir
 renameatu
 stdbool-h
-stdckdint
+stdckdint-h
 stdint
 xalloc-oversized
 

diff --git a/modules/backupfile b/modules/backupfile
index 7731b8dd650293c9c1c8d42c0ec82075e3ba3ee2..2f25801bcb0c8d96638ddc4d5f417dcaff265333 100644 (file)
--- a/modules/backupfile
+++ b/modules/backupfile
@@ -22,7 +22,7 @@ opendirat
 readdir
 renameatu
 stdbool-h
-stdckdint
+stdckdint-h
 stdint
 xalloc-die
 

diff --git a/modules/base32 b/modules/base32
index 9b594363ba01054d18fa782244b966b8e683dc2f..144e953f938ee0d17e5263bfe77450e8ae9c1826 100644 (file)
--- a/modules/base32
+++ b/modules/base32
@@ -11,7 +11,7 @@ extern-inline
 ialloc
 stdbool-h
 memchr
-stdckdint
+stdckdint-h
 
 configure.ac:
 gl_FUNC_BASE32

diff --git a/modules/base64 b/modules/base64
index 2671efeb5cb1222d205feb22b1d0435f52d85755..e2af2ad6a862c865f4ad26699a2afc17200081b0 100644 (file)
--- a/modules/base64
+++ b/modules/base64
@@ -11,7 +11,7 @@ extern-inline
 ialloc
 stdbool-h
 memchr
-stdckdint
+stdckdint-h
 
 configure.ac:
 gl_FUNC_BASE64

diff --git a/modules/c-nstrftime b/modules/c-nstrftime
index 337f8396fcfb99495514f7ff982cde71bf248c4d..921c08ef3cd594842be7349d8a80e64fcdc3f53b 100644 (file)
--- a/modules/c-nstrftime
+++ b/modules/c-nstrftime
@@ -18,7 +18,7 @@ intprops
 libc-config
 locale-h
 stdbool-h
-stdckdint
+stdckdint-h
 time_rz
 
 configure.ac:

diff --git a/modules/calloc-gnu b/modules/calloc-gnu
index 63f498f0d4b2fc9112575c91e58757369c0aa8a4..e588ad79d00b51bba8b30727a487609b486de3aa 100644 (file)
--- a/modules/calloc-gnu
+++ b/modules/calloc-gnu
@@ -8,7 +8,7 @@ m4/calloc.m4
 Depends-on:
 calloc-posix
 extensions-aix
-stdckdint            [test $REPLACE_CALLOC_FOR_CALLOC_GNU = 1]
+stdckdint-h          [test $REPLACE_CALLOC_FOR_CALLOC_GNU = 1]
 
 configure.ac:
 gl_FUNC_CALLOC_GNU

diff --git a/modules/calloc-posix b/modules/calloc-posix
index e455296d7515d71f53421a8e3ffaec144502a8b0..dc9d0729ab5fc4898f058f480a5f2134a09e70a1 100644 (file)
--- a/modules/calloc-posix
+++ b/modules/calloc-posix
@@ -7,7 +7,7 @@ m4/calloc.m4
 m4/malloc.m4
 
 Depends-on:
-stdckdint            [test $REPLACE_CALLOC_FOR_CALLOC_POSIX = 1]
+stdckdint-h          [test $REPLACE_CALLOC_FOR_CALLOC_POSIX = 1]
 stdlib
 
 configure.ac:

diff --git a/modules/chown-tests b/modules/chown-tests
index cf47340a0d31e5d61b3fdfaf20ec128c701c48cc..7be01f2a5043f4e58e18283ed3faf44668fb1542 100644 (file)
--- a/modules/chown-tests
+++ b/modules/chown-tests
@@ -12,7 +12,7 @@ mgetgroups
 nanosleep
 stat-time
 stdbool-h
-stdckdint
+stdckdint-h
 symlink
 xconcat-filename
 xgetcwd

diff --git a/modules/fchownat-tests b/modules/fchownat-tests
index 856ccf8467b5c483e1cc0e59f08cfca270e71870..2132fd01a2595650090eec31290a79531369da36 100644 (file)
--- a/modules/fchownat-tests
+++ b/modules/fchownat-tests
@@ -13,7 +13,7 @@ mgetgroups
 nanosleep
 openat-h
 stat-time
-stdckdint
+stdckdint-h
 symlink
 xconcat-filename
 xgetcwd

diff --git a/modules/fdutimensat-tests b/modules/fdutimensat-tests
index f4eb2ecc04e321fbaf80baa4210535e0c4bf99cd..2798e2b0e07a950f1cd6394aa717d7fcd4155e46 100644 (file)
--- a/modules/fdutimensat-tests
+++ b/modules/fdutimensat-tests
@@ -12,7 +12,7 @@ fcntl-h
 ignore-value
 nanosleep
 openat
-stdckdint
+stdckdint-h
 timespec
 dup
 utimecmp

diff --git a/modules/file-has-acl b/modules/file-has-acl
index ce20e2795da9258c85c3622c15d83a257a517f98..5073e9702703f2fbe0dbf8fa4ad13eb8729af1fe 100644 (file)
--- a/modules/file-has-acl
+++ b/modules/file-has-acl
@@ -21,7 +21,7 @@ malloc-posix
 ssize_t
 stat
 stdbool-h
-stdckdint
+stdckdint-h
 
 configure.ac:
 gl_FILE_HAS_ACL

diff --git a/modules/fnmatch b/modules/fnmatch
index 660d96218d0a68b79492eccd4032ae0f47f94a68..4384e9b5dcfb0178a4a9f83607c2ec2a441f6e76 100644 (file)
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -17,7 +17,7 @@ idx                 [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1]
 isblank             [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1]
 libc-config         [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1]
 stdbool-h           [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1]
-stdckdint           [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]
 memchr              [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1]

diff --git a/modules/ftello b/modules/ftello
index 7a29e6d581a65c7d89b93b939ae7e9a8838c414c..f85c4e8b1d7de77eb6fe950b75b57369310f18f9 100644 (file)
--- a/modules/ftello
+++ b/modules/ftello
@@ -14,7 +14,7 @@ extensions
 largefile
 sys_types
 lseek           [test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1]
-stdckdint       [test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1]
+stdckdint-h     [test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1]
 # Just to guarantee consistency between ftell() and ftello().
 ftell
 

diff --git a/modules/futimens-tests b/modules/futimens-tests
index 7781dff3d337e24ecb7fe429383685ee72b6f01f..d40c3c849c5f2bbc8f5faae94481ef12c3e864ce 100644 (file)
--- a/modules/futimens-tests
+++ b/modules/futimens-tests
@@ -11,7 +11,7 @@ gettext-h
 fcntl-h
 ignore-value
 nanosleep
-stdckdint
+stdckdint-h
 timespec
 dup
 utimecmp

diff --git a/modules/glibc-internal/dynarray b/modules/glibc-internal/dynarray
index 582aa18d60daf4f9ed8ed2b6dc6d08142734f378..3271e69b4ebfff390b5e2a67a5e437b48b1afb1e 100644 (file)
--- a/modules/glibc-internal/dynarray
+++ b/modules/glibc-internal/dynarray
@@ -17,7 +17,7 @@ builtin-expect
 gen-header
 libc-config
 stdbool-h
-stdckdint
+stdckdint-h
 stddef
 
 configure.ac:

diff --git a/modules/glob b/modules/glob
index d4557a2715e5f43af778765d54b5d86cbf28401b..b5475dfb6673da3809ea32ba2dc449704f88f880 100644 (file)
--- a/modules/glob
+++ b/modules/glob
@@ -29,7 +29,7 @@ opendir                       [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
 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                     [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]
 strdup                        [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
 unistd                        [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]

diff --git a/modules/group-member b/modules/group-member
index a1b85c7be827c08065c9defd7a1401050de8b7a4..619b6318efadc7218938f112dd4c47d25fb0ec78 100644 (file)
--- a/modules/group-member
+++ b/modules/group-member
@@ -10,7 +10,7 @@ unistd
 extensions
 getgroups        [test $HAVE_GROUP_MEMBER = 0]
 malloc-gnu       [test $HAVE_GROUP_MEMBER = 0]
-stdckdint        [test $HAVE_GROUP_MEMBER = 0]
+stdckdint-h      [test $HAVE_GROUP_MEMBER = 0]
 
 configure.ac:
 gl_FUNC_GROUP_MEMBER

diff --git a/modules/lchown-tests b/modules/lchown-tests
index 843d5e76e67bd5dad4f9ed0f8dd95f6ece6e57f9..065ec57dd566283b093f4b6aa99a8be7982d53df 100644 (file)
--- a/modules/lchown-tests
+++ b/modules/lchown-tests
@@ -10,7 +10,7 @@ errno-h
 ignore-value
 mgetgroups
 nanosleep
-stdckdint
+stdckdint-h
 stat-time
 stdbool-h
 symlink

diff --git a/modules/malloc-gnu b/modules/malloc-gnu
index 13b26693b78a33c1c5b632f6a74ee5babf1d9b17..946596840b5d8b2c4790fb3e30f24c5705538d57 100644 (file)
--- a/modules/malloc-gnu
+++ b/modules/malloc-gnu
@@ -7,7 +7,7 @@ lib/malloc.c
 Depends-on:
 malloc-posix
 extensions-aix
-stdckdint            [test $REPLACE_CALLOC_FOR_MALLOC_GNU = 1]
+stdckdint-h          [test $REPLACE_CALLOC_FOR_MALLOC_GNU = 1]
 
 configure.ac:
 gl_FUNC_MALLOC_GNU

diff --git a/modules/malloc-posix b/modules/malloc-posix
index a3efe4ca7b53ca8d02f554e58e262e86760cd249..9b06240af8a0504c2eb7e60452e7538e946ca859 100644 (file)
--- a/modules/malloc-posix
+++ b/modules/malloc-posix
@@ -6,7 +6,7 @@ lib/malloc.c
 m4/malloc.m4
 
 Depends-on:
-stdckdint            [test $REPLACE_CALLOC_FOR_MALLOC_POSIX = 1]
+stdckdint-h          [test $REPLACE_CALLOC_FOR_MALLOC_POSIX = 1]
 stdlib
 
 configure.ac:

diff --git a/modules/malloca b/modules/malloca
index 1eb235fe1bb9cddea86393b83d42fdea4d218d64..2c5d2e2cc92dceea39bc6bfdd09d84395a1446c1 100644 (file)
--- a/modules/malloca
+++ b/modules/malloca
@@ -12,7 +12,7 @@ alloca-opt
 assert-h
 extensions-aix
 idx
-stdckdint
+stdckdint-h
 stdint
 xalloc-oversized
 

diff --git a/modules/mktime b/modules/mktime
index 4783935efeeda59dba9988ce9922bf6df582bc0f..9b00f17ff94e69edfb556fcb5373767e5f8f87cc 100644 (file)
--- a/modules/mktime
+++ b/modules/mktime
@@ -14,7 +14,7 @@ assert-h        [test $REPLACE_MKTIME = 1]
 intprops        [test $REPLACE_MKTIME = 1]
 libc-config     [test $REPLACE_MKTIME = 1]
 stdbool-h       [test $REPLACE_MKTIME = 1]
-stdckdint       [test $REPLACE_MKTIME = 1]
+stdckdint-h     [test $REPLACE_MKTIME = 1]
 time_r          [test $REPLACE_MKTIME = 1]
 
 configure.ac:

diff --git a/modules/nstrftime b/modules/nstrftime
index a859d066750472926778a9e2400c254dd1dfa049..6940ad60176de6debe77d1faa345a8ddee809d80 100644 (file)
--- a/modules/nstrftime
+++ b/modules/nstrftime
@@ -17,7 +17,7 @@ intprops
 libc-config
 localename-unsafe-limited
 stdbool-h
-stdckdint
+stdckdint-h
 time_rz
 
 configure.ac:

diff --git a/modules/parse-datetime b/modules/parse-datetime
index fe6f468a69fe49a3641a0fb8426feffb6fd254d1..00f6a008fe0ec645ed0ad125bc9b0b8c4b9c91bd 100644 (file)
--- a/modules/parse-datetime
+++ b/modules/parse-datetime
@@ -21,7 +21,7 @@ idx
 intprops
 inttypes-h
 mktime
-stdckdint
+stdckdint-h
 time-h
 time_r
 time_rz

diff --git a/modules/posix_memalign b/modules/posix_memalign
index e50e44ef239aa231449995372203d44b069a28a5..e6ab0d78906f99e2a3fe64e3cde19e93917a8271 100644 (file)
--- a/modules/posix_memalign
+++ b/modules/posix_memalign
@@ -7,7 +7,7 @@ m4/posix_memalign.m4
 
 Depends-on:
 extensions
-stdckdint        [test $REPLACE_POSIX_MEMALIGN = 1]
+stdckdint-h      [test $REPLACE_POSIX_MEMALIGN = 1]
 stdlib
 
 configure.ac:

diff --git a/modules/posixtm b/modules/posixtm
index e4f96657f9e096ab0a0d96a3522cbd3ac3fa6ccb..431407be2818035c487e7e791677b67e14864c01 100644 (file)
--- a/modules/posixtm
+++ b/modules/posixtm
@@ -11,7 +11,7 @@ c-ctype
 idx
 mktime
 stdbool-h
-stdckdint
+stdckdint-h
 time
 verify
 

diff --git a/modules/realloc-posix b/modules/realloc-posix
index fd4fd89c3db3ee5e259f2973b14385ef849d5d0d..b8bfa1c964e9b239218754247b3f0422dc12577d 100644 (file)
--- a/modules/realloc-posix
+++ b/modules/realloc-posix
@@ -8,7 +8,7 @@ m4/malloc.m4
 
 Depends-on:
 extensions-aix
-stdckdint            [test $REPLACE_REALLOC_FOR_REALLOC_POSIX != 0]
+stdckdint-h          [test $REPLACE_REALLOC_FOR_REALLOC_POSIX != 0]
 stdlib
 
 configure.ac:

diff --git a/modules/reallocarray b/modules/reallocarray
index 28de7a0a3d40dc2d965d8ea860d4bf9c5bd5ca98..f2d1472ba11738891f3cc8ea98141f953f6d9c85 100644 (file)
--- a/modules/reallocarray
+++ b/modules/reallocarray
@@ -10,7 +10,7 @@ m4/reallocarray.m4
 Depends-on:
 extensions
 realloc-posix  [test $HAVE_REALLOCARRAY = 0 || test $REPLACE_REALLOCARRAY = 1]
-stdckdint      [test $HAVE_REALLOCARRAY = 0 || test $REPLACE_REALLOCARRAY = 1]
+stdckdint-h    [test $HAVE_REALLOCARRAY = 0 || test $REPLACE_REALLOCARRAY = 1]
 stdlib
 
 configure.ac:

diff --git a/modules/regex b/modules/regex
index ab046e17a9d5cff49c285540187df541ea127809..7f0a3ec260151c01666403c506af5aae35c9901c 100644 (file)
--- a/modules/regex
+++ b/modules/regex
@@ -37,7 +37,7 @@ mbrtowc                 [test $ac_use_included_regex = yes]
 mbsinit                 [test $ac_use_included_regex = yes]
 nl_langinfo             [test $ac_use_included_regex = yes]
 stdbool-h               [test $ac_use_included_regex = yes]
-stdckdint               [test $ac_use_included_regex = yes]
+stdckdint-h             [test $ac_use_included_regex = yes]
 stdint                  [test $ac_use_included_regex = yes]
 verify                  [test $ac_use_included_regex = yes]
 wchar                   [test $ac_use_included_regex = yes]

diff --git a/modules/relocatable-prog-wrapper b/modules/relocatable-prog-wrapper
index 837c089a4780768b710e3d8bd4e39ba91a52e2a1..00ebccc575eb702cf4e4b763b828e5a8ecd0b5c8 100644 (file)
--- a/modules/relocatable-prog-wrapper
+++ b/modules/relocatable-prog-wrapper
@@ -71,7 +71,7 @@ pathmax
 ssize_t
 stdbool-h
 stddef
-stdckdint
+stdckdint-h
 stdint
 stdlib
 string

diff --git a/modules/stat-time b/modules/stat-time
index 159900303eb1eb5bf8954e7882c8e38ff7f0c506..424f33d48365e4493ba39ad9089981551385d2be 100644 (file)
--- a/modules/stat-time
+++ b/modules/stat-time
@@ -11,7 +11,7 @@ time-h
 errno-h
 extensions
 extern-inline
-stdckdint
+stdckdint-h
 
 configure.ac:
 gl_STAT_TIME

diff --git a/modules/stat-time-tests b/modules/stat-time-tests
index 9a283783b734a6280adba38b1236f81328417a90..5107493c6efc624acefd9d2b408264bcae1a3373 100644 (file)
--- a/modules/stat-time-tests
+++ b/modules/stat-time-tests
@@ -5,7 +5,7 @@ tests/nap.h
 
 Depends-on:
 nanosleep
-stdckdint
+stdckdint-h
 time-h
 unistd
 xconcat-filename

diff --git a/modules/stdckdint b/modules/stdckdint
index e10252758826b5323979d0c5bd3023b278b6a433..d526aeeda57e33f6b3f2c2aef7af740b1d5b387c 100644 (file)
--- a/modules/stdckdint
+++ b/modules/stdckdint
@@ -1,40 +1,20 @@
 Description:
 An <stdckdint.h> that is like C23.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'stdckdint-h' instead.
+
 Files:
-lib/stdckdint.in.h
-lib/intprops-internal.h
 
 Depends-on:
-gen-header
-stdbool-h
+stdckdint-h
 
 configure.ac:
-AC_CHECK_HEADERS_ONCE([stdckdint.h])
-if test $ac_cv_header_stdckdint_h = yes; then
-  GL_GENERATE_STDCKDINT_H=false
-else
-  GL_GENERATE_STDCKDINT_H=true
-fi
-gl_CONDITIONAL_HEADER([stdckdint.h])
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += $(STDCKDINT_H)
-
-# We need the following in order to create <stdckdint.h> when the system
-# doesn't have one that works with the given compiler.
-if GL_GENERATE_STDCKDINT_H
-stdckdint.h: stdckdint.in.h $(top_builddir)/config.status
-@NMD@  $(AM_V_GEN)$(MKDIR_P) '%reldir%'
-       $(gl_V_at)$(SED_HEADER_STDOUT) \
-         $(srcdir)/stdckdint.in.h > $@-t
-       $(AM_V_at)mv $@-t $@
-else
-stdckdint.h: $(top_builddir)/config.status
-       rm -f $@
-endif
-MOSTLYCLEANFILES += stdckdint.h stdckdint.h-t
 
 Include:
 <stdckdint.h>
@@ -43,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-Paul Eggert

diff --git a/modules/stdckdint-c++-tests b/modules/stdckdint-c++-tests
deleted file mode 100644 (file)
index 8eb4b48..0000000
--- a/modules/stdckdint-c++-tests
+++ /dev/null
@@ -1,17 +0,0 @@
-Files:
-tests/test-stdckdint-c++.cc
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-stdckdint-c++
-check_PROGRAMS += test-stdckdint-c++
-test_stdckdint_c___SOURCES = test-stdckdint-c++.cc
-endif

diff --git a/modules/stdckdint-h b/modules/stdckdint-h
new file mode 100644 (file)
index 0000000..e102527
--- /dev/null
+++ b/modules/stdckdint-h
@@ -0,0 +1,46 @@
+Description:
+An <stdckdint.h> that is like C23.
+
+Files:
+lib/stdckdint.in.h
+lib/intprops-internal.h
+
+Depends-on:
+gen-header
+stdbool-h
+
+configure.ac:
+AC_CHECK_HEADERS_ONCE([stdckdint.h])
+if test $ac_cv_header_stdckdint_h = yes; then
+  GL_GENERATE_STDCKDINT_H=false
+else
+  GL_GENERATE_STDCKDINT_H=true
+fi
+gl_CONDITIONAL_HEADER([stdckdint.h])
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += $(STDCKDINT_H)
+
+# We need the following in order to create <stdckdint.h> when the system
+# doesn't have one that works with the given compiler.
+if GL_GENERATE_STDCKDINT_H
+stdckdint.h: stdckdint.in.h $(top_builddir)/config.status
+@NMD@  $(AM_V_GEN)$(MKDIR_P) '%reldir%'
+       $(gl_V_at)$(SED_HEADER_STDOUT) \
+         $(srcdir)/stdckdint.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
+else
+stdckdint.h: $(top_builddir)/config.status
+       rm -f $@
+endif
+MOSTLYCLEANFILES += stdckdint.h stdckdint.h-t
+
+Include:
+<stdckdint.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+Paul Eggert

diff --git a/modules/stdckdint-h-c++-tests b/modules/stdckdint-h-c++-tests
new file mode 100644 (file)
index 0000000..b38ffeb
--- /dev/null
+++ b/modules/stdckdint-h-c++-tests
@@ -0,0 +1,17 @@
+Files:
+tests/test-stdckdint-h-c++.cc
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-stdckdint-h-c++
+check_PROGRAMS += test-stdckdint-h-c++
+test_stdckdint_h_c___SOURCES = test-stdckdint-h-c++.cc
+endif

diff --git a/modules/stdckdint-tests b/modules/stdckdint-h-tests
similarity index 51%
rename from modules/stdckdint-tests
rename to modules/stdckdint-h-tests
index 0b5cb2c80460da08e20925b841cb8be08685ac1a..6e12249cb7fcdb502de4f44b09ff0fe5f499bc5d 100644 (file)
--- a/modules/stdckdint-tests
+++ b/modules/stdckdint-h-tests
@@ -1,16 +1,16 @@
 Files:
 tests/macros.h
 tests/test-intprops.c
-tests/test-stdckdint.c
+tests/test-stdckdint-h.c
 
 Depends-on:
 assert-h
 inttypes-h
 stdbool-h
-stdckdint-c++-tests
+stdckdint-h-c++-tests
 
 configure.ac:
 
 Makefile.am:
-TESTS += test-stdckdint
-check_PROGRAMS += test-stdckdint
+TESTS += test-stdckdint-h
+check_PROGRAMS += test-stdckdint-h

diff --git a/modules/timespec-add b/modules/timespec-add
index f1251bb4bf1f1b1cf954cdf8deb0827008e667db..91b61bb385f8e4330c876efa39e2eeaa30db8b0c 100644 (file)
--- a/modules/timespec-add
+++ b/modules/timespec-add
@@ -8,7 +8,7 @@ Depends-on:
 c99
 intprops
 stdbool-h
-stdckdint
+stdckdint-h
 timespec
 
 configure.ac:

diff --git a/modules/timespec-sub b/modules/timespec-sub
index 39d3d69e6862f3442143d9068d00e1329fbc683c..78999325769db64489390c24772a940cb59cea3d 100644 (file)
--- a/modules/timespec-sub
+++ b/modules/timespec-sub
@@ -8,7 +8,7 @@ Depends-on:
 c99
 intprops
 stdbool-h
-stdckdint
+stdckdint-h
 timespec
 
 configure.ac:

diff --git a/modules/utime-tests b/modules/utime-tests
index e354b476b8a476b1d9db95ee770ce5a2c208b339..bd30c021389b8665fab71aca7c55a86370f7a989 100644 (file)
--- a/modules/utime-tests
+++ b/modules/utime-tests
@@ -9,7 +9,7 @@ dup
 gettext-h
 ignore-value
 nanosleep
-stdckdint
+stdckdint-h
 symlink
 timespec
 utimecmp

diff --git a/modules/utimens-tests b/modules/utimens-tests
index 3899bf08d4c17eb9763bf8a1671d5cc572a30eec..93365373ec5b17e9b461686c7b4fc11f540e1fdf 100644 (file)
--- a/modules/utimens-tests
+++ b/modules/utimens-tests
@@ -12,7 +12,7 @@ dup
 gettext-h
 ignore-value
 nanosleep
-stdckdint
+stdckdint-h
 symlink
 timespec
 utimecmp

diff --git a/modules/utimensat-tests b/modules/utimensat-tests
index 03c8d9990fc1ee4a63a4f24b377637c8161696b8..5b65328e2879ef34b1d0bc252711995ccb7b5ed1 100644 (file)
--- a/modules/utimensat-tests
+++ b/modules/utimensat-tests
@@ -10,7 +10,7 @@ tests/macros.h
 Depends-on:
 ignore-value
 nanosleep
-stdckdint
+stdckdint-h
 timespec
 utimecmp
 xconcat-filename

diff --git a/modules/xalloc b/modules/xalloc
index 3ff92ae57ff526334d82ab9e8f277f41ec92b655..e5fa303ef6f051ed1bf1063d383490094dc091dc 100644 (file)
--- a/modules/xalloc
+++ b/modules/xalloc
@@ -16,7 +16,7 @@ malloc-gnu
 minmax
 realloc-posix
 reallocarray
-stdckdint
+stdckdint-h
 stdint
 xalloc-die
 

diff --git a/modules/xstrtol b/modules/xstrtol
index ef49dfc357b1f215d1985dfdd0ad2917ac51e126..6b7b41a4496bd8e45c25df06021cf1d32525b699 100644 (file)
--- a/modules/xstrtol
+++ b/modules/xstrtol
@@ -9,7 +9,7 @@ m4/xstrtol.m4
 
 Depends-on:
 intprops
-stdckdint
+stdckdint-h
 stdint
 
 configure.ac:

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

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