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.

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.

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
+Gnulib module: sys_wait-h
-@mindex sys_wait
+@mindex sys_wait-h
 
 Portability problems fixed by Gnulib:
 @itemize

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

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:

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:

modules/popen-safer-tests

@@ -7,7 +7,7 @@ tests/macros.h
 Depends-on:
 dup2
 pclose
-sys_wait
+sys_wait-h
 
 configure.ac:
 

modules/popen-tests

@@ -7,7 +7,7 @@ tests/macros.h
 Depends-on:
 dup2
 pclose
-sys_wait
+sys_wait-h
 
 configure.ac:
 

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

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

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

modules/savewd

@@ -18,7 +18,7 @@ filename
 raise
 stdbool-h
 stdlib-h
-sys_wait
+sys_wait-h
 unistd
 xalloc
 

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

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
+sys_wait-h
-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>
@@ -45,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-all

modules/sys_wait-c++-tests

@@ -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

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

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

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

modules/sys_wait-tests

@@ -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

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])

modules/wait-process

@@ -16,7 +16,7 @@ gettext-h
 gnulib-i18n
 stdbool-h
 stdlib-h
-sys_wait
+sys_wait-h
 unistd
 atexit
 waitpid

modules/waitpid

@@ -6,7 +6,7 @@ lib/waitpid.c
 m4/waitpid.m4
 
 Depends-on:
-sys_wait
+sys_wait-h
 
 configure.ac:
 gl_FUNC_WAITPID

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

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)