Rename module stdarg to stdarg-h.

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

diff --git a/ChangeLog b/ChangeLog
index 894222c5550c54203d817651f08cb2a5905edaaa..7237379aca56f5e897b25f1ae2df3a79de2373d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+       Rename module stdarg to stdarg-h.
+       * modules/stdarg-h: Renamed from modules/stdarg.
+       * modules/stdarg-h-tests: Renamed from modules/stdarg-tests.
+       * modules/stdarg-h-c++-tests: Renamed from modules/stdarg-c++-tests.
+       * tests/test-stdarg-h-c++.cc: Renamed from tests/test-stdarg-c++.cc.
+       * tests/test-stdarg-h-c++2.cc: Renamed from tests/test-stdarg-c++2.cc.
+       * doc/posix-headers/stdarg.texi: Update.
+       * doc/posix-functions/va_copy.texi: Update.
+       * modules/* (Depends-on): Update.
+       * modules/stdarg: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
        Rename module stdalign to stdalign-h.

diff --git a/doc/posix-functions/va_copy.texi b/doc/posix-functions/va_copy.texi
index 2a2b4ece73d84d33ae1aa32f5ca80f840a35fba9..b4f13f2d4b4ff15a640ff0b646be499202a82383 100644 (file)
--- a/doc/posix-functions/va_copy.texi
+++ b/doc/posix-functions/va_copy.texi
@@ -4,8 +4,8 @@
 
 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/va_copy.html}
 
-Gnulib module: stdarg
-@mindex stdarg
+Gnulib module: stdarg-h
+@mindex stdarg-h
 
 Portability problems fixed by Gnulib:
 @itemize

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

diff --git a/modules/stdarg b/modules/stdarg
index 98668cfba10c5ceb80686459f7cc26d29a2f7806..2c27d8cbe665bb76aa4bf73f8b3f0449752736b0 100644 (file)
--- a/modules/stdarg
+++ b/modules/stdarg
@@ -1,45 +1,20 @@
 Description:
 An <stdarg.h> that conforms to C99.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'stdarg-h' instead.
+
 Files:
-lib/stdarg.in.h
-m4/stdarg.m4
 
 Depends-on:
-gen-header
-include_next
-
-configure.ac-early:
-dnl Some compilers (e.g., AIX 5.3 cc) need to be in c99 mode
-dnl for the builtin va_copy to work.  gl_PROG_CC_C99 arranges for this.
-gl_PROG_CC_C99
+stdarg-h
 
 configure.ac:
-gl_STDARG_H
-gl_CONDITIONAL_HEADER([stdarg.h])
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += $(STDARG_H)
-
-# We need the following in order to create <stdarg.h> when the system
-# doesn't have one that works with the given compiler.
-if GL_GENERATE_STDARG_H
-stdarg.h: stdarg.in.h $(top_builddir)/config.status
-@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|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \
-             $(srcdir)/stdarg.in.h > $@-t
-       $(AM_V_at)mv $@-t $@
-else
-stdarg.h: $(top_builddir)/config.status
-       rm -f $@
-endif
-MOSTLYCLEANFILES += stdarg.h stdarg.h-t
 
 Include:
 <stdarg.h>
@@ -48,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-all

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

diff --git a/modules/stdarg-h b/modules/stdarg-h
new file mode 100644 (file)
index 0000000..98668cf
--- /dev/null
+++ b/modules/stdarg-h
@@ -0,0 +1,51 @@
+Description:
+An <stdarg.h> that conforms to C99.
+
+Files:
+lib/stdarg.in.h
+m4/stdarg.m4
+
+Depends-on:
+gen-header
+include_next
+
+configure.ac-early:
+dnl Some compilers (e.g., AIX 5.3 cc) need to be in c99 mode
+dnl for the builtin va_copy to work.  gl_PROG_CC_C99 arranges for this.
+gl_PROG_CC_C99
+
+configure.ac:
+gl_STDARG_H
+gl_CONDITIONAL_HEADER([stdarg.h])
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += $(STDARG_H)
+
+# We need the following in order to create <stdarg.h> when the system
+# doesn't have one that works with the given compiler.
+if GL_GENERATE_STDARG_H
+stdarg.h: stdarg.in.h $(top_builddir)/config.status
+@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|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \
+             $(srcdir)/stdarg.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
+else
+stdarg.h: $(top_builddir)/config.status
+       rm -f $@
+endif
+MOSTLYCLEANFILES += stdarg.h stdarg.h-t
+
+Include:
+<stdarg.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all

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

diff --git a/modules/stdarg-tests b/modules/stdarg-h-tests
similarity index 72%
rename from modules/stdarg-tests
rename to modules/stdarg-h-tests
index 0a1c5930f660ff0f9056b8f8dc1a78c0812952d7..aadeab71db77a6645e877103aaf327861301ca09 100644 (file)
--- a/modules/stdarg-tests
+++ b/modules/stdarg-h-tests
@@ -1,7 +1,7 @@
 Files:
 
 Depends-on:
-stdarg-c++-tests
+stdarg-h-c++-tests
 
 configure.ac:
 

diff --git a/modules/string-buffer b/modules/string-buffer
index 21d3fdcf5be8b8248ce43b2cd23f1827a4663399..128f98e46289ff9d099baa460a527688257a335d 100644 (file)
--- a/modules/string-buffer
+++ b/modules/string-buffer
@@ -10,7 +10,7 @@ Depends-on:
 stdbool
 attribute
 string-desc
-stdarg
+stdarg-h
 vsnzprintf-posix
 
 configure.ac:

diff --git a/modules/version-etc b/modules/version-etc
index 5357d37a87db54200bb39f58bfe2e9a806fb3cad..beee0ac29f79115ee1816442868759a7274a1e36 100644 (file)
--- a/modules/version-etc
+++ b/modules/version-etc
@@ -9,7 +9,7 @@ m4/version-etc.m4
 Depends-on:
 gettext-h
 gnulib-i18n
-stdarg
+stdarg-h
 
 configure.ac:
 gl_VERSION_ETC

diff --git a/modules/xprintf b/modules/xprintf
index dfe8cbe114242fd8edee35d3b382acfc338e925c..e92080a17097cab761d341766df77a9a6387db0d 100644 (file)
--- a/modules/xprintf
+++ b/modules/xprintf
@@ -12,7 +12,7 @@ error
 exitfail
 gettext-h
 gnulib-i18n
-stdarg
+stdarg-h
 vzprintf
 vfzprintf
 

diff --git a/modules/xvasprintf b/modules/xvasprintf
index cca6608ac9fb58a7f6fa7d11a4dc325ebc086b9e..4f4acaf2973248dc2f457d56cb924e20911d5c62 100644 (file)
--- a/modules/xvasprintf
+++ b/modules/xvasprintf
@@ -17,7 +17,7 @@ xalloc
 xalloc-die
 extern-inline
 xsize
-stdarg
+stdarg-h
 errno-h
 
 configure.ac:

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

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