Rename module sys_uio to sys_uio-h.

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

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

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

diff --git a/modules/sys_socket-h b/modules/sys_socket-h
index bbd337f7895c791dc2c925e26e6749c539fb3434..684df00a844e959aecf3f0222500699b224bc9ec 100644 (file)
--- a/modules/sys_socket-h
+++ b/modules/sys_socket-h
@@ -18,7 +18,7 @@ snippet/c++defs
 snippet/warn-on-use
 socklen
 ssize_t
-sys_uio
+sys_uio-h
 
 configure.ac:
 gl_SYS_SOCKET_H

diff --git a/modules/sys_uio b/modules/sys_uio
index 391e23270278c4baaa69c08b4fcae21c1d1911e1..1f8480bcb6a7452563ad17a12f963cdd6d25dcca 100644 (file)
--- a/modules/sys_uio
+++ b/modules/sys_uio
@@ -1,39 +1,20 @@
 Description:
 A POSIX-like <sys/uio.h>.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'sys_uio-h' instead.
+
 Files:
-lib/sys_uio.in.h
-m4/sys_uio_h.m4
 
 Depends-on:
-gen-header
-include_next
-ssize_t
-sys_types-h
+sys_uio-h
 
 configure.ac:
-gl_SYS_UIO_H
-gl_SYS_UIO_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += sys/uio.h
-
-# We need the following in order to create <sys/uio.h> when the system
-# doesn't have one that works with the given compiler.
-sys/uio.h: sys_uio.in.h $(top_builddir)/config.status
-       $(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_UIO_H''@|$(NEXT_SYS_UIO_H)|g' \
-             -e 's|@''HAVE_SYS_UIO_H''@|$(HAVE_SYS_UIO_H)|g' \
-             $(srcdir)/sys_uio.in.h > $@-t
-       $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += sys/uio.h sys/uio.h-t
-MOSTLYCLEANDIRS += sys
 
 Include:
 <sys/uio.h>
@@ -42,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-Eric Blake

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

diff --git a/modules/sys_uio-h b/modules/sys_uio-h
new file mode 100644 (file)
index 0000000..391e232
--- /dev/null
+++ b/modules/sys_uio-h
@@ -0,0 +1,45 @@
+Description:
+A POSIX-like <sys/uio.h>.
+
+Files:
+lib/sys_uio.in.h
+m4/sys_uio_h.m4
+
+Depends-on:
+gen-header
+include_next
+ssize_t
+sys_types-h
+
+configure.ac:
+gl_SYS_UIO_H
+gl_SYS_UIO_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += sys/uio.h
+
+# We need the following in order to create <sys/uio.h> when the system
+# doesn't have one that works with the given compiler.
+sys/uio.h: sys_uio.in.h $(top_builddir)/config.status
+       $(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_UIO_H''@|$(NEXT_SYS_UIO_H)|g' \
+             -e 's|@''HAVE_SYS_UIO_H''@|$(HAVE_SYS_UIO_H)|g' \
+             $(srcdir)/sys_uio.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += sys/uio.h sys/uio.h-t
+MOSTLYCLEANDIRS += sys
+
+Include:
+<sys/uio.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+Eric Blake

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

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

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

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

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