From: Bruno Haible Date: Fri, 27 Dec 2024 22:41:38 +0000 (+0100) Subject: Rename module sys_times to sys_times-h. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=73ea612ad116fde53fd7e2a9fe070ab8c9287546;p=gnulib.git Rename module sys_times to sys_times-h. * modules/sys_times-h: Renamed from modules/sys_times. * modules/sys_times-h-tests: Renamed from modules/sys_times-tests. * modules/sys_times-h-c++-tests: Renamed from modules/sys_times-c++-tests. * tests/test-sys_times-h.c: Renamed from tests/test-sys_times.c. * tests/test-sys_times-h-c++.cc: Renamed from tests/test-sys_times-c++.cc. * doc/posix-headers/sys_times.texi: Update. * modules/* (Depends-on): Update. * modules/sys_times: New file. --- diff --git a/ChangeLog b/ChangeLog index 4388a592b4..de362265f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2024-12-27 Bruno Haible + + Rename module sys_times to sys_times-h. + * modules/sys_times-h: Renamed from modules/sys_times. + * modules/sys_times-h-tests: Renamed from modules/sys_times-tests. + * modules/sys_times-h-c++-tests: Renamed from + modules/sys_times-c++-tests. + * tests/test-sys_times-h.c: Renamed from tests/test-sys_times.c. + * tests/test-sys_times-h-c++.cc: Renamed from + tests/test-sys_times-c++.cc. + * doc/posix-headers/sys_times.texi: Update. + * modules/* (Depends-on): Update. + * modules/sys_times: New file. + 2024-12-27 Bruno Haible Rename module sys_time to sys_time-h. diff --git a/doc/posix-headers/sys_times.texi b/doc/posix-headers/sys_times.texi index f49ec07348..ef7f1ec8a9 100644 --- a/doc/posix-headers/sys_times.texi +++ b/doc/posix-headers/sys_times.texi @@ -3,8 +3,8 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_times.h.html} -Gnulib module: sys_times -@mindex sys_times +Gnulib module: sys_times-h +@mindex sys_times-h Portability problems fixed by Gnulib: @itemize diff --git a/modules/posixcheck b/modules/posixcheck index e3f9bc22c2..343bdf4133 100644 --- a/modules/posixcheck +++ b/modules/posixcheck @@ -40,7 +40,7 @@ sys_select-h sys_socket-h sys_stat-h sys_time-h -sys_times +sys_times-h sys_utsname sys_wait termios diff --git a/modules/sys_times b/modules/sys_times index 6a4a092963..5afefb3c74 100644 --- a/modules/sys_times +++ b/modules/sys_times @@ -1,44 +1,20 @@ Description: A for systems lacking it. +Status: +deprecated + +Notice: +This module is deprecated. Use the module 'sys_times-h' instead. + Files: -lib/sys_times.in.h -m4/sys_times_h.m4 Depends-on: -gen-header -include_next -snippet/arg-nonnull -snippet/warn-on-use +sys_times-h configure.ac: -gl_SYS_TIMES_H -gl_SYS_TIMES_H_REQUIRE_DEFAULTS -AC_PROG_MKDIR_P Makefile.am: -BUILT_SOURCES += sys/times.h - -# We need the following in order to create when the system -# doesn't have one that works with the given compiler. -sys/times.h: sys_times.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_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/@''HAVE_SYS_TIMES_H''@/$(HAVE_SYS_TIMES_H)/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_TIMES_H''@|$(NEXT_SYS_TIMES_H)|g' \ - -e 's/@''GNULIB_TIMES''@/$(GNULIB_TIMES)/g' \ - -e 's|@''HAVE_STRUCT_TMS''@|$(HAVE_STRUCT_TMS)|g' \ - -e 's|@''HAVE_TIMES''@|$(HAVE_TIMES)|g' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - $(srcdir)/sys_times.in.h > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += sys/times.h sys/times.h-t -MOSTLYCLEANDIRS += sys Include: @@ -47,4 +23,3 @@ License: LGPLv2+ Maintainer: -Simon Josefsson diff --git a/modules/sys_times-c++-tests b/modules/sys_times-c++-tests deleted file mode 100644 index a55256d2ea..0000000000 --- a/modules/sys_times-c++-tests +++ /dev/null @@ -1,17 +0,0 @@ -Files: -tests/test-sys_times-c++.cc - -Status: -c++-test - -Depends-on: -ansi-c++-opt - -configure.ac: - -Makefile.am: -if ANSICXX -TESTS += test-sys_times-c++ -check_PROGRAMS += test-sys_times-c++ -test_sys_times_c___SOURCES = test-sys_times-c++.cc -endif diff --git a/modules/sys_times-h b/modules/sys_times-h new file mode 100644 index 0000000000..6a4a092963 --- /dev/null +++ b/modules/sys_times-h @@ -0,0 +1,50 @@ +Description: +A for systems lacking it. + +Files: +lib/sys_times.in.h +m4/sys_times_h.m4 + +Depends-on: +gen-header +include_next +snippet/arg-nonnull +snippet/warn-on-use + +configure.ac: +gl_SYS_TIMES_H +gl_SYS_TIMES_H_REQUIRE_DEFAULTS +AC_PROG_MKDIR_P + +Makefile.am: +BUILT_SOURCES += sys/times.h + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +sys/times.h: sys_times.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_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/@''HAVE_SYS_TIMES_H''@/$(HAVE_SYS_TIMES_H)/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_TIMES_H''@|$(NEXT_SYS_TIMES_H)|g' \ + -e 's/@''GNULIB_TIMES''@/$(GNULIB_TIMES)/g' \ + -e 's|@''HAVE_STRUCT_TMS''@|$(HAVE_STRUCT_TMS)|g' \ + -e 's|@''HAVE_TIMES''@|$(HAVE_TIMES)|g' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + $(srcdir)/sys_times.in.h > $@-t + $(AM_V_at)mv $@-t $@ +MOSTLYCLEANFILES += sys/times.h sys/times.h-t +MOSTLYCLEANDIRS += sys + +Include: + + +License: +LGPLv2+ + +Maintainer: +Simon Josefsson diff --git a/modules/sys_times-h-c++-tests b/modules/sys_times-h-c++-tests new file mode 100644 index 0000000000..f31e4892be --- /dev/null +++ b/modules/sys_times-h-c++-tests @@ -0,0 +1,17 @@ +Files: +tests/test-sys_times-h-c++.cc + +Status: +c++-test + +Depends-on: +ansi-c++-opt + +configure.ac: + +Makefile.am: +if ANSICXX +TESTS += test-sys_times-h-c++ +check_PROGRAMS += test-sys_times-h-c++ +test_sys_times_h_c___SOURCES = test-sys_times-h-c++.cc +endif diff --git a/modules/sys_times-h-tests b/modules/sys_times-h-tests new file mode 100644 index 0000000000..b01bf141db --- /dev/null +++ b/modules/sys_times-h-tests @@ -0,0 +1,11 @@ +Files: +tests/test-sys_times-h.c + +Depends-on: +sys_times-h-c++-tests + +configure.ac: + +Makefile.am: +TESTS += test-sys_times-h +check_PROGRAMS += test-sys_times-h diff --git a/modules/sys_times-tests b/modules/sys_times-tests deleted file mode 100644 index f5d4021bdd..0000000000 --- a/modules/sys_times-tests +++ /dev/null @@ -1,11 +0,0 @@ -Files: -tests/test-sys_times.c - -Depends-on: -sys_times-c++-tests - -configure.ac: - -Makefile.am: -TESTS += test-sys_times -check_PROGRAMS += test-sys_times diff --git a/modules/times b/modules/times index 4b15d0f8b8..622acfcba4 100644 --- a/modules/times +++ b/modules/times @@ -6,7 +6,7 @@ lib/times.c m4/times.m4 Depends-on: -sys_times +sys_times-h configure.ac: gl_FUNC_TIMES diff --git a/modules/timevar b/modules/timevar index 7e966531fc..d4a645125c 100644 --- a/modules/timevar +++ b/modules/timevar @@ -17,7 +17,7 @@ gettext-h gnulib-i18n stdlib-h sys_time-h -sys_times +sys_times-h xalloc Makefile.am: diff --git a/tests/test-sys_times-c++.cc b/tests/test-sys_times-c++.cc deleted file mode 100644 index 5488c72984..0000000000 --- a/tests/test-sys_times-c++.cc +++ /dev/null @@ -1,28 +0,0 @@ -/* Test of substitute in C++ mode. - Copyright (C) 2022-2024 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -/* Written by Bruno Haible , 2022. */ - -#define GNULIB_NAMESPACE gnulib -#include - -#include - - -int -main () -{ -} diff --git a/tests/test-sys_times-h-c++.cc b/tests/test-sys_times-h-c++.cc new file mode 100644 index 0000000000..5488c72984 --- /dev/null +++ b/tests/test-sys_times-h-c++.cc @@ -0,0 +1,28 @@ +/* Test of substitute in C++ mode. + Copyright (C) 2022-2024 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Written by Bruno Haible , 2022. */ + +#define GNULIB_NAMESPACE gnulib +#include + +#include + + +int +main () +{ +} diff --git a/tests/test-sys_times-h.c b/tests/test-sys_times-h.c new file mode 100644 index 0000000000..429b1fa083 --- /dev/null +++ b/tests/test-sys_times-h.c @@ -0,0 +1,30 @@ +/* Test of substitute. + Copyright (C) 2008-2024 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Written by Simon Josefsson , 2008. */ + +#include + +#include + +static struct tms tms; + +int +main (void) +{ + clock_t t = tms.tms_utime + tms.tms_stime + tms.tms_cutime + tms.tms_cstime; + return t; +} diff --git a/tests/test-sys_times.c b/tests/test-sys_times.c deleted file mode 100644 index 429b1fa083..0000000000 --- a/tests/test-sys_times.c +++ /dev/null @@ -1,30 +0,0 @@ -/* Test of substitute. - Copyright (C) 2008-2024 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -/* Written by Simon Josefsson , 2008. */ - -#include - -#include - -static struct tms tms; - -int -main (void) -{ - clock_t t = tms.tms_utime + tms.tms_stime + tms.tms_cutime + tms.tms_cstime; - return t; -}