From: Bruno Haible <bruno@clisp.org>
Date: Fri, 27 Dec 2024 22:39:55 +0000 (+0100)
Subject: Rename module sys_select to sys_select-h.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ae22bd5dcc01ff8aec0342a5b61220cdb5a90a2;p=thirdparty%2Fgnulib.git

Rename module sys_select to sys_select-h.

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

diff --git a/ChangeLog b/ChangeLog
index 534102b8f3..389564a428 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+	Rename module sys_select to sys_select-h.
+	* modules/sys_select-h: Renamed from modules/sys_select.
+	* modules/sys_select-h-tests: Renamed from modules/sys_select-tests.
+	* modules/sys_select-h-c++-tests: Renamed from
+	modules/sys_select-c++-tests.
+	* tests/test-sys_select-h.c: Renamed from tests/test-sys_select.c.
+	* tests/test-sys_select-h-c++.cc: Renamed from
+	tests/test-sys_select-c++.cc.
+	* doc/posix-headers/sys_select.texi: Update.
+	* modules/* (Depends-on): Update.
+	* modules/sys_select: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
 	Rename module sys_resource to sys_resource-h.
diff --git a/doc/posix-headers/sys_select.texi b/doc/posix-headers/sys_select.texi
index 32e55b5aad..a0579b1f4f 100644
--- a/doc/posix-headers/sys_select.texi
+++ b/doc/posix-headers/sys_select.texi
@@ -3,8 +3,8 @@
 
 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_select.h.html}
 
-Gnulib module: sys_select
-@mindex sys_select
+Gnulib module: sys_select-h
+@mindex sys_select-h
 
 Portability problems fixed by Gnulib:
 @itemize
diff --git a/modules/nanosleep b/modules/nanosleep
index 034704d60b..10176a1cca 100644
--- a/modules/nanosleep
+++ b/modules/nanosleep
@@ -13,7 +13,7 @@ assert-h        [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
 intprops        [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
 pselect         [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
 stdbool-h       [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
-sys_select      [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
+sys_select-h    [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
 
 configure.ac:
 gl_FUNC_NANOSLEEP
diff --git a/modules/pipe-filter-gi b/modules/pipe-filter-gi
index d32fecb866..6841bdd7e0 100644
--- a/modules/pipe-filter-gi
+++ b/modules/pipe-filter-gi
@@ -19,7 +19,7 @@ gnulib-i18n
 stdbool-h
 stdint-h
 stdlib-h
-sys_select
+sys_select-h
 unistd
 xalloc
 
diff --git a/modules/pipe-filter-ii b/modules/pipe-filter-ii
index 4baae3067f..c01d406f8c 100644
--- a/modules/pipe-filter-ii
+++ b/modules/pipe-filter-ii
@@ -18,7 +18,7 @@ gnulib-i18n
 stdbool-h
 stdint-h
 stdlib-h
-sys_select
+sys_select-h
 unistd
 
 configure.ac:
diff --git a/modules/poll b/modules/poll
index 793f34506f..ce77e998c9 100644
--- a/modules/poll
+++ b/modules/poll
@@ -11,7 +11,7 @@ alloca          [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
 assure          [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
 select          [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
 sockets         [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
-sys_select      [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
+sys_select-h    [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
 sys_socket      [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
 sys_time        [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
 errno-h         [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
diff --git a/modules/posixcheck b/modules/posixcheck
index a125194bcf..04fc89cc16 100644
--- a/modules/posixcheck
+++ b/modules/posixcheck
@@ -36,7 +36,7 @@ sys_file-h
 sys_ioctl-h
 sys_random-h
 sys_resource-h
-sys_select
+sys_select-h
 sys_socket
 sys_stat
 sys_time
diff --git a/modules/pselect b/modules/pselect
index 36037a59b3..d2edfc7802 100644
--- a/modules/pselect
+++ b/modules/pselect
@@ -6,7 +6,7 @@ lib/pselect.c
 m4/pselect.m4
 
 Depends-on:
-sys_select
+sys_select-h
 pthread_sigmask [test $HAVE_PSELECT = 0 || test $REPLACE_PSELECT = 1]
 select          [test $HAVE_PSELECT = 0 || test $REPLACE_PSELECT = 1]
 dup2            [test $REPLACE_PSELECT = 1]
diff --git a/modules/select b/modules/select
index eb1d13bbb5..7082f72eac 100644
--- a/modules/select
+++ b/modules/select
@@ -6,7 +6,7 @@ lib/select.c
 m4/select.m4
 
 Depends-on:
-sys_select
+sys_select-h
 alloca          [test $REPLACE_SELECT = 1]
 dup2            [test $REPLACE_SELECT = 1]
 sockets         [test $REPLACE_SELECT = 1]
diff --git a/modules/sys_select b/modules/sys_select
index 5c8934ec29..fa7a18f06e 100644
--- a/modules/sys_select
+++ b/modules/sys_select
@@ -1,50 +1,20 @@
 Description:
 A <sys/select.h> for systems lacking it.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'sys_select-h' instead.
+
 Files:
-lib/sys_select.in.h
-m4/sys_select_h.m4
-m4/sys_socket_h.m4
 
 Depends-on:
-gen-header
-include_next
-signal-h
-snippet/c++defs
-snippet/warn-on-use
-sys_time
+sys_select-h
 
 configure.ac:
-gl_SYS_SELECT_H
-gl_SYS_SELECT_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += sys/select.h
-
-# We need the following in order to create <sys/select.h> when the system
-# doesn't have one that works with the given compiler.
-sys/select.h: sys_select.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_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \
-	      -e 's|@''HAVE_SYS_SELECT_H''@|$(HAVE_SYS_SELECT_H)|g' \
-	      -e 's/@''GNULIB_PSELECT''@/$(GNULIB_PSELECT)/g' \
-	      -e 's/@''GNULIB_SELECT''@/$(GNULIB_SELECT)/g' \
-	      -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
-	      -e 's|@''HAVE_PSELECT''@|$(HAVE_PSELECT)|g' \
-	      -e 's|@''REPLACE_PSELECT''@|$(REPLACE_PSELECT)|g' \
-	      -e 's|@''REPLACE_SELECT''@|$(REPLACE_SELECT)|g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      $(srcdir)/sys_select.in.h > $@-t
-	$(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += sys/select.h sys/select.h-t
-MOSTLYCLEANDIRS += sys
 
 Include:
 <sys/select.h>
@@ -53,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-Simon Josefsson
diff --git a/modules/sys_select-c++-tests b/modules/sys_select-c++-tests
deleted file mode 100644
index fc93cbfd54..0000000000
--- a/modules/sys_select-c++-tests
+++ /dev/null
@@ -1,19 +0,0 @@
-Files:
-tests/test-sys_select-c++.cc
-tests/signature.h
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-sys_select-c++
-check_PROGRAMS += test-sys_select-c++
-test_sys_select_c___SOURCES = test-sys_select-c++.cc
-test_sys_select_c___LDADD = $(LDADD) $(LIBINTL) $(SELECT_LIB) $(NANOSLEEP_LIB)
-endif
diff --git a/modules/sys_select-h b/modules/sys_select-h
new file mode 100644
index 0000000000..5c8934ec29
--- /dev/null
+++ b/modules/sys_select-h
@@ -0,0 +1,56 @@
+Description:
+A <sys/select.h> for systems lacking it.
+
+Files:
+lib/sys_select.in.h
+m4/sys_select_h.m4
+m4/sys_socket_h.m4
+
+Depends-on:
+gen-header
+include_next
+signal-h
+snippet/c++defs
+snippet/warn-on-use
+sys_time
+
+configure.ac:
+gl_SYS_SELECT_H
+gl_SYS_SELECT_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += sys/select.h
+
+# We need the following in order to create <sys/select.h> when the system
+# doesn't have one that works with the given compiler.
+sys/select.h: sys_select.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_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \
+	      -e 's|@''HAVE_SYS_SELECT_H''@|$(HAVE_SYS_SELECT_H)|g' \
+	      -e 's/@''GNULIB_PSELECT''@/$(GNULIB_PSELECT)/g' \
+	      -e 's/@''GNULIB_SELECT''@/$(GNULIB_SELECT)/g' \
+	      -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
+	      -e 's|@''HAVE_PSELECT''@|$(HAVE_PSELECT)|g' \
+	      -e 's|@''REPLACE_PSELECT''@|$(REPLACE_PSELECT)|g' \
+	      -e 's|@''REPLACE_SELECT''@|$(REPLACE_SELECT)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      $(srcdir)/sys_select.in.h > $@-t
+	$(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += sys/select.h sys/select.h-t
+MOSTLYCLEANDIRS += sys
+
+Include:
+<sys/select.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+Simon Josefsson
diff --git a/modules/sys_select-h-c++-tests b/modules/sys_select-h-c++-tests
new file mode 100644
index 0000000000..11885a92e6
--- /dev/null
+++ b/modules/sys_select-h-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-sys_select-h-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-sys_select-h-c++
+check_PROGRAMS += test-sys_select-h-c++
+test_sys_select_h_c___SOURCES = test-sys_select-h-c++.cc
+test_sys_select_h_c___LDADD = $(LDADD) $(LIBINTL) $(SELECT_LIB) $(NANOSLEEP_LIB)
+endif
diff --git a/modules/sys_select-h-tests b/modules/sys_select-h-tests
new file mode 100644
index 0000000000..0823b902b0
--- /dev/null
+++ b/modules/sys_select-h-tests
@@ -0,0 +1,12 @@
+Files:
+tests/test-sys_select-h.c
+tests/signature.h
+
+Depends-on:
+sys_select-h-c++-tests
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-sys_select-h
+check_PROGRAMS += test-sys_select-h
diff --git a/modules/sys_select-tests b/modules/sys_select-tests
deleted file mode 100644
index a8127b23fe..0000000000
--- a/modules/sys_select-tests
+++ /dev/null
@@ -1,12 +0,0 @@
-Files:
-tests/test-sys_select.c
-tests/signature.h
-
-Depends-on:
-sys_select-c++-tests
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-sys_select
-check_PROGRAMS += test-sys_select
diff --git a/tests/test-sys_select-c++.cc b/tests/test-sys_select-h-c++.cc
similarity index 100%
rename from tests/test-sys_select-c++.cc
rename to tests/test-sys_select-h-c++.cc
diff --git a/tests/test-sys_select.c b/tests/test-sys_select-h.c
similarity index 100%
rename from tests/test-sys_select.c
rename to tests/test-sys_select-h.c