Rename module sys_wait to sys_wait-h.

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

diff --git a/ChangeLog b/ChangeLog
index 6a269c0431cad7287678ec02c0865298772670e9..ff8b6ca13908e77768229d177d9f8406581ce7b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+       Rename module sys_wait to sys_wait-h.
+       * modules/sys_wait-h: Renamed from modules/sys_wait.
+       * modules/sys_wait-h-tests: Renamed from modules/sys_wait-tests.
+       * modules/sys_wait-h-c++-tests: Renamed from modules/sys_wait-c++-tests.
+       * tests/test-sys_wait-h.h: Renamed from tests/test-sys_wait.h.
+       * tests/test-sys_wait-h.c: Renamed from tests/test-sys_wait.c.
+       * tests/test-stdlib-h.c: Update.
+       * tests/test-sys_wait-h-c++.cc: Renamed from tests/test-sys_wait-c++.cc.
+       * doc/posix-headers/sys_wait.texi: Update.
+       * modules/* (Depends-on): Update.
+       * modules/sys_wait: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
        Rename module sys_utsname to sys_utsname-h.

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

diff --git a/modules/execute b/modules/execute
index 59bbd1721e77cc8d7c576f03768d4622270feea5..c847eddf27b907bc232299c28aebbc7a968a8a03 100644 (file)
--- a/modules/execute
+++ b/modules/execute
@@ -31,7 +31,7 @@ posix_spawnattr_setflags
 posix_spawnattr_destroy
 stdbool-h
 stdlib-h
-sys_wait
+sys_wait-h
 unistd
 wait-process
 windows-spawn

diff --git a/modules/execve b/modules/execve
index caf0918350e426207761d4fb6a7053a7bd76ec83..f9f034d1dd139f7c86553c7c72cb315adf2d1080 100644 (file)
--- a/modules/execve
+++ b/modules/execve
@@ -9,7 +9,7 @@ Depends-on:
 unistd
 posix_spawn     [test $REPLACE_EXECVE = 1]
 close           [test $REPLACE_EXECVE = 1]
-sys_wait        [test $REPLACE_EXECVE = 1]
+sys_wait-h      [test $REPLACE_EXECVE = 1]
 waitpid         [test $REPLACE_EXECVE = 1]
 
 configure.ac:

diff --git a/modules/passfd-tests b/modules/passfd-tests
index 4d304349f1e44a6eb6554410bc54a847773217d3..766031bb7591a5f8bf875a507f1daf0371ddcd18 100644 (file)
--- a/modules/passfd-tests
+++ b/modules/passfd-tests
@@ -3,7 +3,7 @@ tests/test-passfd.c
 tests/macros.h
 
 Depends-on:
-sys_wait
+sys_wait-h
 test-xfail
 
 configure.ac:

diff --git a/modules/popen-safer-tests b/modules/popen-safer-tests
index 2fa7b2d49b16dc498c940f95c1bec8b99d2ca095..c276ccb500eeea4268c196fa505646eb0c19531e 100644 (file)
--- a/modules/popen-safer-tests
+++ b/modules/popen-safer-tests
@@ -7,7 +7,7 @@ tests/macros.h
 Depends-on:
 dup2
 pclose
-sys_wait
+sys_wait-h
 
 configure.ac:
 

diff --git a/modules/popen-tests b/modules/popen-tests
index 25a0e91109fc0863f9436b14f61c43d29bc8cb7b..ec662af92f39b24ddefa72a000adefb9a76776dc 100644 (file)
--- a/modules/popen-tests
+++ b/modules/popen-tests
@@ -7,7 +7,7 @@ tests/macros.h
 Depends-on:
 dup2
 pclose
-sys_wait
+sys_wait-h
 
 configure.ac:
 

diff --git a/modules/posix_spawn-tests b/modules/posix_spawn-tests
index 828dd515495955b477eb9c9e1ba6e763f31b5b1c..84c1e560b3a853f2283613e0fb404ac77f37f3f0 100644 (file)
--- a/modules/posix_spawn-tests
+++ b/modules/posix_spawn-tests
@@ -16,7 +16,7 @@ posix_spawn_file_actions_addopen
 posix_spawn_file_actions_destroy
 stdbool-h
 unistd
-sys_wait
+sys_wait-h
 environ
 fflush
 freopen

diff --git a/modules/posix_spawnp-tests b/modules/posix_spawnp-tests
index 62bfb1b9a1b6cae00161168c93105c8ed69f67fa..c3350464227f89cf1dc9ff0dae3cdb1c39f27ccc 100644 (file)
--- a/modules/posix_spawnp-tests
+++ b/modules/posix_spawnp-tests
@@ -22,7 +22,7 @@ posix_spawnattr_setflags
 posix_spawnattr_destroy
 stdbool-h
 unistd
-sys_wait
+sys_wait-h
 dup
 environ
 sh-filename

diff --git a/modules/posixcheck b/modules/posixcheck
index c2d0b5219b40fdddd93433718cc6b1310a3a4477..053160f60d6d15f32098e07b5fe52a8a28d4d332 100644 (file)
--- a/modules/posixcheck
+++ b/modules/posixcheck
@@ -42,7 +42,7 @@ sys_stat-h
 sys_time-h
 sys_times-h
 sys_utsname-h
-sys_wait
+sys_wait-h
 termios
 threads-h
 time-h

diff --git a/modules/savewd b/modules/savewd
index cebe3266468692beb7ccaf0b45a2544a2923bfa8..750d7cf64799df4e13a87a39c7e3953de232e4fe 100644 (file)
--- a/modules/savewd
+++ b/modules/savewd
@@ -18,7 +18,7 @@ filename
 raise
 stdbool-h
 stdlib-h
-sys_wait
+sys_wait-h
 unistd
 xalloc
 

diff --git a/modules/stdlib-h-tests b/modules/stdlib-h-tests
index 234f9dcc41ca53c84d9cb1e64a3430e150143a80..af38b9dba45d61b539f363fa0028d36ce7614455 100644 (file)
--- a/modules/stdlib-h-tests
+++ b/modules/stdlib-h-tests
@@ -1,6 +1,6 @@
 Files:
 tests/test-stdlib-h.c
-tests/test-sys_wait.h
+tests/test-sys_wait-h.h
 
 Depends-on:
 assert-h

diff --git a/modules/sys_wait b/modules/sys_wait
index 455cf961fba0d4500699716d1e8f9e5e7454deca..772e679d4db866465adc020580a2e16941640767 100644 (file)
--- a/modules/sys_wait
+++ b/modules/sys_wait
@@ -1,42 +1,20 @@
 Description:
 A <sys/wait.h> for systems with missing declarations.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'sys_wait-h' instead.
+
 Files:
-lib/sys_wait.in.h
-m4/sys_wait_h.m4
-m4/pid_t.m4
 
 Depends-on:
-gen-header
-include_next
-snippet/c++defs
-snippet/warn-on-use
+sys_wait-h
 
 configure.ac:
-gl_SYS_WAIT_H
-gl_SYS_WAIT_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += sys/wait.h
-
-# We need the following in order to create <sys/wait.h> when the system
-# has one that is incomplete.
-sys/wait.h: sys_wait.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
-       $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
-       $(AM_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_SYS_WAIT_H''@|$(NEXT_SYS_WAIT_H)|g' \
-             -e 's/@''GNULIB_WAITPID''@/$(GNULIB_WAITPID)/g' \
-             -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             $(srcdir)/sys_wait.in.h > $@-t
-       $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += sys/wait.h sys/wait.h-t
-MOSTLYCLEANDIRS += sys
 
 Include:
 <sys/wait.h>
@@ -45,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-all

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

diff --git a/modules/sys_wait-h b/modules/sys_wait-h
new file mode 100644 (file)
index 0000000..455cf96
--- /dev/null
+++ b/modules/sys_wait-h
@@ -0,0 +1,48 @@
+Description:
+A <sys/wait.h> for systems with missing declarations.
+
+Files:
+lib/sys_wait.in.h
+m4/sys_wait_h.m4
+m4/pid_t.m4
+
+Depends-on:
+gen-header
+include_next
+snippet/c++defs
+snippet/warn-on-use
+
+configure.ac:
+gl_SYS_WAIT_H
+gl_SYS_WAIT_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += sys/wait.h
+
+# We need the following in order to create <sys/wait.h> when the system
+# has one that is incomplete.
+sys/wait.h: sys_wait.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+       $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
+       $(AM_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_SYS_WAIT_H''@|$(NEXT_SYS_WAIT_H)|g' \
+             -e 's/@''GNULIB_WAITPID''@/$(GNULIB_WAITPID)/g' \
+             -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+             $(srcdir)/sys_wait.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += sys/wait.h sys/wait.h-t
+MOSTLYCLEANDIRS += sys
+
+Include:
+<sys/wait.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all

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

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

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

diff --git a/modules/system-posix b/modules/system-posix
index 102fff537cbd5ca17404a8c73d1f484debb188e7..34455d562530c1601de225b3b63525776f7ce302 100644 (file)
--- a/modules/system-posix
+++ b/modules/system-posix
@@ -5,7 +5,7 @@ Files:
 
 Depends-on:
 stdlib-h
-sys_wait
+sys_wait-h
 
 configure.ac:
 gl_STDLIB_MODULE_INDICATOR([system-posix])

diff --git a/modules/wait-process b/modules/wait-process
index 177124f39d3124738b2e75890dcc27a6be56f388..fd7a7f132fd65411dffa8060fafd44769111cc13 100644 (file)
--- a/modules/wait-process
+++ b/modules/wait-process
@@ -16,7 +16,7 @@ gettext-h
 gnulib-i18n
 stdbool-h
 stdlib-h
-sys_wait
+sys_wait-h
 unistd
 atexit
 waitpid

diff --git a/modules/waitpid b/modules/waitpid
index 52a7a9bda8806691d6681ee6dac9afc322dae8c0..098fd2dbcdb544645cfe09cc1da716c173d0f56b 100644 (file)
--- a/modules/waitpid
+++ b/modules/waitpid
@@ -6,7 +6,7 @@ lib/waitpid.c
 m4/waitpid.m4
 
 Depends-on:
-sys_wait
+sys_wait-h
 
 configure.ac:
 gl_FUNC_WAITPID

diff --git a/tests/test-stdlib-h.c b/tests/test-stdlib-h.c
index 7b9cd50a794df29674c78b83ef86c577dda64218..e3b7b7b5bb280ae3d723d94c0488042b14b38005 100644 (file)
--- a/tests/test-stdlib-h.c
+++ b/tests/test-stdlib-h.c
@@ -37,7 +37,7 @@ static int exitcode = EXIT_SUCCESS;
 static_assert (sizeof NULL == sizeof (void *));
 
 #if GNULIB_TEST_SYSTEM_POSIX
-# include "test-sys_wait.h"
+# include "test-sys_wait-h.h"
 #else
 # define test_sys_wait_macros() 0
 #endif

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

diff --git a/tests/test-sys_wait.c b/tests/test-sys_wait-h.c
similarity index 97%
rename from tests/test-sys_wait.c
rename to tests/test-sys_wait-h.c
index bdd6428926d7acd2608c0d31fb563e72d162faed..3b9b756fc64125fd4c1756fa884510f93d25110d 100644 (file)
--- a/tests/test-sys_wait.c
+++ b/tests/test-sys_wait-h.c
@@ -23,7 +23,7 @@
 /* Check for existence of required types.  */
 static pid_t a;
 
-#include "test-sys_wait.h"
+#include "test-sys_wait-h.h"
 
 int
 main (void)

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