Rename module inttypes-incomplete to inttypes-h-incomplete.

* modules/inttypes-h-incomplete: Renamed from
modules/inttypes-incomplete.
* modules/* (Depends-on): Update.
* modules/inttypes-incomplete: New file.

diff --git a/ChangeLog b/ChangeLog
index de2bca82e344eb5080ab436b718adf1d03cd963b..fb72ddfb83e6a7f35023da2a626bb527eb8b6ef5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+       Rename module inttypes-incomplete to inttypes-h-incomplete.
+       * modules/inttypes-h-incomplete: Renamed from
+       modules/inttypes-incomplete.
+       * modules/* (Depends-on): Update.
+       * modules/inttypes-incomplete: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
        Rename module float to float-h.

diff --git a/modules/hamt b/modules/hamt
index d8b0d7207aa562bb2a225a8f53db176e3c026914..66ab38fbc0fd4a7433137d8aa149889eff7fa824 100644 (file)
--- a/modules/hamt
+++ b/modules/hamt
@@ -9,7 +9,7 @@ Depends-on:
 count-one-bits
 extern-inline
 flexmember
-inttypes-incomplete
+inttypes-h-incomplete
 stdbool
 stdint
 verify

diff --git a/modules/imaxabs b/modules/imaxabs
index e33b48ff8edfd15d8b5ca3363e14e481442aaf1f..89c83601255751e3cd8d682c0667b159237c8079 100644 (file)
--- a/modules/imaxabs
+++ b/modules/imaxabs
@@ -6,7 +6,7 @@ lib/imaxabs.c
 m4/imaxabs.m4
 
 Depends-on:
-inttypes-incomplete
+inttypes-h-incomplete
 
 configure.ac:
 gl_FUNC_IMAXABS

diff --git a/modules/imaxdiv b/modules/imaxdiv
index 74f800b64f345d3807f96173ebc09a9f5585338d..b1f32a38e4d726f45a8524d352302cfdc7e17939 100644 (file)
--- a/modules/imaxdiv
+++ b/modules/imaxdiv
@@ -6,7 +6,7 @@ lib/imaxdiv.c
 m4/imaxdiv.m4
 
 Depends-on:
-inttypes-incomplete
+inttypes-h-incomplete
 
 configure.ac:
 gl_FUNC_IMAXDIV

diff --git a/modules/inttypes b/modules/inttypes
index 8344346fd1827b783ad00b2cc88e3cfd965eb622..074332a170c0b4891fa296e233046ff2056993b8 100644 (file)
--- a/modules/inttypes
+++ b/modules/inttypes
@@ -4,7 +4,7 @@ An <inttypes.h> that nearly conforms to C99.
 Files:
 
 Depends-on:
-inttypes-incomplete
+inttypes-h-incomplete
 extensions
 
 configure.ac:

diff --git a/modules/inttypes-h-incomplete b/modules/inttypes-h-incomplete
new file mode 100644 (file)
index 0000000..96ab2e3
--- /dev/null
+++ b/modules/inttypes-h-incomplete
@@ -0,0 +1,68 @@
+Description:
+An <inttypes.h> that conforms to C99 except for PRI* and SCN* macros.
+
+Files:
+lib/inttypes.in.h
+m4/inttypes.m4
+
+Depends-on:
+gen-header
+include_next
+multiarch
+snippet/arg-nonnull
+snippet/c++defs
+snippet/warn-on-use
+stdint
+
+configure.ac:
+gl_INTTYPES_INCOMPLETE
+gl_INTTYPES_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += inttypes.h
+
+# We need the following in order to create <inttypes.h> when the system
+# doesn't have one that works with the given compiler.
+inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
+@NMD@  $(AM_V_GEN)$(MKDIR_P) '%reldir%'
+       $(gl_V_at)$(SED_HEADER_STDOUT) \
+             -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_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_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \
+             -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
+             -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \
+             -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \
+             -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \
+             -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \
+             -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \
+             -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \
+             -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \
+             -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
+             -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
+             -e 's/@''HAVE_IMAXDIV_T''@/$(HAVE_IMAXDIV_T)/g' \
+             -e 's/@''REPLACE_IMAXABS''@/$(REPLACE_IMAXABS)/g' \
+             -e 's/@''REPLACE_IMAXDIV''@/$(REPLACE_IMAXDIV)/g' \
+             -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \
+             -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \
+             -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
+             -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \
+             -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \
+             -e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/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)/inttypes.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += inttypes.h inttypes.h-t
+
+Include:
+<inttypes.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all

diff --git a/modules/inttypes-incomplete b/modules/inttypes-incomplete
index 96ab2e3cdd6b5a944eace809f2b46977e1af50e8..4fd8870db5245c1301b1916fb97f793e592747cf 100644 (file)
--- a/modules/inttypes-incomplete
+++ b/modules/inttypes-incomplete
@@ -1,62 +1,20 @@
 Description:
 An <inttypes.h> that conforms to C99 except for PRI* and SCN* macros.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'inttypes-h-incomplete' instead.
+
 Files:
-lib/inttypes.in.h
-m4/inttypes.m4
 
 Depends-on:
-gen-header
-include_next
-multiarch
-snippet/arg-nonnull
-snippet/c++defs
-snippet/warn-on-use
-stdint
+inttypes-h-incomplete
 
 configure.ac:
-gl_INTTYPES_INCOMPLETE
-gl_INTTYPES_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += inttypes.h
-
-# We need the following in order to create <inttypes.h> when the system
-# doesn't have one that works with the given compiler.
-inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
-@NMD@  $(AM_V_GEN)$(MKDIR_P) '%reldir%'
-       $(gl_V_at)$(SED_HEADER_STDOUT) \
-             -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_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_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \
-             -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
-             -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \
-             -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \
-             -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \
-             -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \
-             -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \
-             -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \
-             -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \
-             -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
-             -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
-             -e 's/@''HAVE_IMAXDIV_T''@/$(HAVE_IMAXDIV_T)/g' \
-             -e 's/@''REPLACE_IMAXABS''@/$(REPLACE_IMAXABS)/g' \
-             -e 's/@''REPLACE_IMAXDIV''@/$(REPLACE_IMAXDIV)/g' \
-             -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \
-             -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \
-             -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
-             -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \
-             -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \
-             -e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/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)/inttypes.in.h > $@-t
-       $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += inttypes.h inttypes.h-t
 
 Include:
 <inttypes.h>
@@ -65,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-all

diff --git a/modules/posixcheck b/modules/posixcheck
index e84a28279bd69566bba365d006f4223d2c412ee2..0460a5f20b869fb9e76cf1ed85963096634d32bf 100644 (file)
--- a/modules/posixcheck
+++ b/modules/posixcheck
@@ -14,7 +14,7 @@ fcntl-h
 fnmatch-h
 glob-h
 iconv-h
-inttypes-incomplete
+inttypes-h-incomplete
 langinfo
 locale
 malloc-h

diff --git a/modules/strtoimax b/modules/strtoimax
index 8acb8e2806ef03c568a33484e97f1c5756e00a58..004438f764d750360c69de4c26e78da99a65aa77 100644 (file)
--- a/modules/strtoimax
+++ b/modules/strtoimax
@@ -6,7 +6,7 @@ lib/strtoimax.c
 m4/strtoimax.m4
 
 Depends-on:
-inttypes-incomplete
+inttypes-h-incomplete
 assert-h        [test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1]
 stdint          [test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1]
 strtoll         [test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1]

diff --git a/modules/strtoumax b/modules/strtoumax
index 8b9cad1fa36351b048c4d96038afc2433ebe1166..9fd95ee67edd2eca0bfad7ebc6ba606b6e1fb5ad 100644 (file)
--- a/modules/strtoumax
+++ b/modules/strtoumax
@@ -7,7 +7,7 @@ lib/strtoumax.c
 m4/strtoumax.m4
 
 Depends-on:
-inttypes-incomplete
+inttypes-h-incomplete
 assert-h        [test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1]
 stdint          [test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1]
 strtoull        [test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1]

diff --git a/modules/wchar b/modules/wchar
index ac2ce394a3de937d5d77388f8199b24cda19b781..f4b7518751bed69a9b7502dc3e9fa9b801568ff9 100644 (file)
--- a/modules/wchar
+++ b/modules/wchar
@@ -14,7 +14,7 @@ snippet/arg-nonnull
 snippet/c++defs
 snippet/warn-on-use
 extern-inline
-inttypes-incomplete
+inttypes-h-incomplete
 stddef
 stdlib
 

diff --git a/modules/xstrtoimax b/modules/xstrtoimax
index 42de8b00ab38c0b6e564cea43bd25fd53a34e764..92f77bc89e20757f372b401836b407cdeea2851b 100644 (file)
--- a/modules/xstrtoimax
+++ b/modules/xstrtoimax
@@ -6,7 +6,7 @@ lib/xstrtoimax.c
 
 Depends-on:
 xstrtol
-inttypes-incomplete
+inttypes-h-incomplete
 strtoimax
 
 configure.ac:

diff --git a/modules/xstrtoumax b/modules/xstrtoumax
index a70dcd0d2f23c768f25d51797a4d35cf1f58d923..82153462b186a95fdf36f5831f3937fbe9121a8c 100644 (file)
--- a/modules/xstrtoumax
+++ b/modules/xstrtoumax
@@ -6,7 +6,7 @@ lib/xstrtoumax.c
 
 Depends-on:
 xstrtol
-inttypes-incomplete
+inttypes-h-incomplete
 strtoumax
 
 configure.ac: