From 2b43bd904dda49b18bc7603988ffba6a08c44267 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 27 Dec 2024 23:41:42 +0100 Subject: [PATCH] Rename module sys_un to sys_un-h. * modules/sys_un-h: Renamed from modules/sys_un. * modules/sys_un-h-tests: Renamed from modules/sys_un-tests. * modules/sys_un-h-c++-tests: Renamed from modules/sys_un-c++-tests. * tests/test-sys_un-h.c: Renamed from tests/test-sys_un.c. * tests/test-sys_un-h-c++.cc: Renamed from tests/test-sys_un-c++.cc. * doc/posix-headers/sys_un.texi: Update. * modules/sys_un: New file. --- ChangeLog | 11 ++++ doc/posix-headers/sys_un.texi | 4 +- modules/sys_un | 40 +++------------ modules/sys_un-c++-tests | 17 ------- modules/sys_un-h | 51 +++++++++++++++++++ modules/sys_un-h-c++-tests | 17 +++++++ modules/sys_un-h-tests | 12 +++++ modules/sys_un-tests | 12 ----- ...est-sys_un-c++.cc => test-sys_un-h-c++.cc} | 0 tests/{test-sys_un.c => test-sys_un-h.c} | 0 10 files changed, 100 insertions(+), 64 deletions(-) delete mode 100644 modules/sys_un-c++-tests create mode 100644 modules/sys_un-h create mode 100644 modules/sys_un-h-c++-tests create mode 100644 modules/sys_un-h-tests delete mode 100644 modules/sys_un-tests rename tests/{test-sys_un-c++.cc => test-sys_un-h-c++.cc} (100%) rename tests/{test-sys_un.c => test-sys_un-h.c} (100%) diff --git a/ChangeLog b/ChangeLog index b4fcea1b77..e67e0c52b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2024-12-27 Bruno Haible + + Rename module sys_un to sys_un-h. + * modules/sys_un-h: Renamed from modules/sys_un. + * modules/sys_un-h-tests: Renamed from modules/sys_un-tests. + * modules/sys_un-h-c++-tests: Renamed from modules/sys_un-c++-tests. + * tests/test-sys_un-h.c: Renamed from tests/test-sys_un.c. + * tests/test-sys_un-h-c++.cc: Renamed from tests/test-sys_un-c++.cc. + * doc/posix-headers/sys_un.texi: Update. + * modules/sys_un: New file. + 2024-12-27 Bruno Haible Rename module sys_uio to sys_uio-h. diff --git a/doc/posix-headers/sys_un.texi b/doc/posix-headers/sys_un.texi index e25b1edc0f..63be81d8d2 100644 --- a/doc/posix-headers/sys_un.texi +++ b/doc/posix-headers/sys_un.texi @@ -3,8 +3,8 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_un.h.html} -Gnulib module: sys_un -@mindex sys_un +Gnulib module: sys_un-h +@mindex sys_un-h Portability problems fixed by Gnulib: @itemize diff --git a/modules/sys_un b/modules/sys_un index 3c1b3ba505..dccb411966 100644 --- a/modules/sys_un +++ b/modules/sys_un @@ -1,45 +1,20 @@ Description: A POSIX-like . +Status: +deprecated + +Notice: +This module is deprecated. Use the module 'sys_un-h' instead. + Files: -lib/sys_un.in.h -m4/sys_un_h.m4 Depends-on: -gen-header -include_next -sys_socket-h +sys_un-h configure.ac: -gl_SYS_UN_H -gl_CONDITIONAL_HEADER([sys/un.h]) -AC_PROG_MKDIR_P Makefile.am: -BUILT_SOURCES += $(SYS_UN_H) - -# We need the following in order to create when the system -# doesn't have one. -if GL_GENERATE_SYS_UN_H -sys/un.h: sys_un.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_SYS_UN_H''@|$(NEXT_SYS_UN_H)|g' \ - -e 's|@''HAVE_SYS_UN_H''@|$(HAVE_SYS_UN_H)|g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's|@''HAVE_AFUNIX_H''@|$(HAVE_AFUNIX_H)|g' \ - $(srcdir)/sys_un.in.h > $@-t - $(AM_V_at)mv $@-t $@ -else -sys/un.h: $(top_builddir)/config.status - rm -f $@ -endif -MOSTLYCLEANFILES += sys/un.h sys/un.h-t -MOSTLYCLEANDIRS += sys Include: @@ -48,4 +23,3 @@ License: LGPLv2+ Maintainer: -all diff --git a/modules/sys_un-c++-tests b/modules/sys_un-c++-tests deleted file mode 100644 index d5aac5183a..0000000000 --- a/modules/sys_un-c++-tests +++ /dev/null @@ -1,17 +0,0 @@ -Files: -tests/test-sys_un-c++.cc - -Status: -c++-test - -Depends-on: -ansi-c++-opt - -configure.ac: - -Makefile.am: -if ANSICXX -TESTS += test-sys_un-c++ -check_PROGRAMS += test-sys_un-c++ -test_sys_un_c___SOURCES = test-sys_un-c++.cc -endif diff --git a/modules/sys_un-h b/modules/sys_un-h new file mode 100644 index 0000000000..3c1b3ba505 --- /dev/null +++ b/modules/sys_un-h @@ -0,0 +1,51 @@ +Description: +A POSIX-like . + +Files: +lib/sys_un.in.h +m4/sys_un_h.m4 + +Depends-on: +gen-header +include_next +sys_socket-h + +configure.ac: +gl_SYS_UN_H +gl_CONDITIONAL_HEADER([sys/un.h]) +AC_PROG_MKDIR_P + +Makefile.am: +BUILT_SOURCES += $(SYS_UN_H) + +# We need the following in order to create when the system +# doesn't have one. +if GL_GENERATE_SYS_UN_H +sys/un.h: sys_un.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_SYS_UN_H''@|$(NEXT_SYS_UN_H)|g' \ + -e 's|@''HAVE_SYS_UN_H''@|$(HAVE_SYS_UN_H)|g' \ + -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ + -e 's|@''HAVE_AFUNIX_H''@|$(HAVE_AFUNIX_H)|g' \ + $(srcdir)/sys_un.in.h > $@-t + $(AM_V_at)mv $@-t $@ +else +sys/un.h: $(top_builddir)/config.status + rm -f $@ +endif +MOSTLYCLEANFILES += sys/un.h sys/un.h-t +MOSTLYCLEANDIRS += sys + +Include: + + +License: +LGPLv2+ + +Maintainer: +all diff --git a/modules/sys_un-h-c++-tests b/modules/sys_un-h-c++-tests new file mode 100644 index 0000000000..b9e260ad40 --- /dev/null +++ b/modules/sys_un-h-c++-tests @@ -0,0 +1,17 @@ +Files: +tests/test-sys_un-h-c++.cc + +Status: +c++-test + +Depends-on: +ansi-c++-opt + +configure.ac: + +Makefile.am: +if ANSICXX +TESTS += test-sys_un-h-c++ +check_PROGRAMS += test-sys_un-h-c++ +test_sys_un_h_c___SOURCES = test-sys_un-h-c++.cc +endif diff --git a/modules/sys_un-h-tests b/modules/sys_un-h-tests new file mode 100644 index 0000000000..e2e3bf7860 --- /dev/null +++ b/modules/sys_un-h-tests @@ -0,0 +1,12 @@ +Files: +tests/test-sys_un-h.c + +Depends-on: +assert-h +sys_un-h-c++-tests + +configure.ac: + +Makefile.am: +TESTS += test-sys_un-h +check_PROGRAMS += test-sys_un-h diff --git a/modules/sys_un-tests b/modules/sys_un-tests deleted file mode 100644 index ef4e81bb82..0000000000 --- a/modules/sys_un-tests +++ /dev/null @@ -1,12 +0,0 @@ -Files: -tests/test-sys_un.c - -Depends-on: -assert-h -sys_un-c++-tests - -configure.ac: - -Makefile.am: -TESTS += test-sys_un -check_PROGRAMS += test-sys_un diff --git a/tests/test-sys_un-c++.cc b/tests/test-sys_un-h-c++.cc similarity index 100% rename from tests/test-sys_un-c++.cc rename to tests/test-sys_un-h-c++.cc diff --git a/tests/test-sys_un.c b/tests/test-sys_un-h.c similarity index 100% rename from tests/test-sys_un.c rename to tests/test-sys_un-h.c -- 2.39.5