From: Bruno Haible Date: Wed, 8 Mar 2023 09:41:00 +0000 (+0100) Subject: time-h: Renamed from time. X-Git-Tag: v1.0~1651 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=3ef8e9910ae8f0e5d63cff8f37e22bb5aa9109ae;p=gnulib.git time-h: Renamed from time. * modules/time-h: Renamed from modules/time. * tests/test-time-h.c: Renamed from tests/test-time.c. * modules/time-h-tests: Renamed from modules/time-tests. Update. * tests/test-time-h-c++.cc: Renamed from tests/test-time-c++.cc. * tests/test-time-h-c++2.cc: Renamed from tests/test-time-c++2.cc. * modules/time-h-c++-tests: Renamed from modules/time-c++-tests. Update. * modules/cond (Depends-on): Update. * modules/ctime (Depends-on): Likewise. * modules/localtime (Depends-on): Likewise. * modules/mktime (Depends-on): Likewise. * modules/nanosleep (Depends-on): Likewise. * modules/parse-datetime (Depends-on): Likewise. * modules/posixcheck (Depends-on): Likewise. * modules/pthread-h (Depends-on): Likewise. * modules/stat-time (Depends-on): Likewise. * modules/stat-time-tests (Depends-on): Likewise. * modules/strftime-fixes (Depends-on): Likewise. * modules/strptime (Depends-on): Likewise. * modules/sys_stat (Depends-on): Likewise. * modules/tempname (Depends-on): Likewise. * modules/threads-h (Depends-on): Likewise. * modules/time_r (Depends-on): Likewise. * modules/time_rz (Depends-on): Likewise. * modules/timegm (Depends-on): Likewise. * modules/timespec (Depends-on): Likewise. * modules/timespec_get (Depends-on): Likewise. * modules/timespec_getres (Depends-on): Likewise. * modules/tzset (Depends-on): Likewise. * modules/usleep-tests (Depends-on): Likewise. * modules/utime (Depends-on): Likewise. * modules/utimecmp (Depends-on): Likewise. * modules/utimens (Depends-on): Likewise. * modules/windows-cond (Depends-on): Likewise. * modules/windows-timedmutex (Depends-on): Likewise. * modules/windows-timedrecmutex (Depends-on): Likewise. * modules/windows-timedrwlock (Depends-on): Likewise. * modules/xnanosleep (Depends-on): Likewise. * doc/posix-headers/time.texi: Update. * NEWS: Mention the change. --- diff --git a/ChangeLog b/ChangeLog index cec18435b2..aac31c31a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,46 @@ +2023-03-08 Bruno Haible + + time-h: Renamed from time. + * modules/time-h: Renamed from modules/time. + * tests/test-time-h.c: Renamed from tests/test-time.c. + * modules/time-h-tests: Renamed from modules/time-tests. Update. + * tests/test-time-h-c++.cc: Renamed from tests/test-time-c++.cc. + * tests/test-time-h-c++2.cc: Renamed from tests/test-time-c++2.cc. + * modules/time-h-c++-tests: Renamed from modules/time-c++-tests. Update. + * modules/cond (Depends-on): Update. + * modules/ctime (Depends-on): Likewise. + * modules/localtime (Depends-on): Likewise. + * modules/mktime (Depends-on): Likewise. + * modules/nanosleep (Depends-on): Likewise. + * modules/parse-datetime (Depends-on): Likewise. + * modules/posixcheck (Depends-on): Likewise. + * modules/pthread-h (Depends-on): Likewise. + * modules/stat-time (Depends-on): Likewise. + * modules/stat-time-tests (Depends-on): Likewise. + * modules/strftime-fixes (Depends-on): Likewise. + * modules/strptime (Depends-on): Likewise. + * modules/sys_stat (Depends-on): Likewise. + * modules/tempname (Depends-on): Likewise. + * modules/threads-h (Depends-on): Likewise. + * modules/time_r (Depends-on): Likewise. + * modules/time_rz (Depends-on): Likewise. + * modules/timegm (Depends-on): Likewise. + * modules/timespec (Depends-on): Likewise. + * modules/timespec_get (Depends-on): Likewise. + * modules/timespec_getres (Depends-on): Likewise. + * modules/tzset (Depends-on): Likewise. + * modules/usleep-tests (Depends-on): Likewise. + * modules/utime (Depends-on): Likewise. + * modules/utimecmp (Depends-on): Likewise. + * modules/utimens (Depends-on): Likewise. + * modules/windows-cond (Depends-on): Likewise. + * modules/windows-timedmutex (Depends-on): Likewise. + * modules/windows-timedrecmutex (Depends-on): Likewise. + * modules/windows-timedrwlock (Depends-on): Likewise. + * modules/xnanosleep (Depends-on): Likewise. + * doc/posix-headers/time.texi: Update. + * NEWS: Mention the change. + 2023-03-08 Bruno Haible gettimeofday tests: Enhance test. diff --git a/NEWS b/NEWS index 0ec377915c..ad7e1e69f5 100644 --- a/NEWS +++ b/NEWS @@ -74,6 +74,8 @@ User visible incompatible changes Date Modules Changes +2023-03-08 time This module is renamed to 'time-h'. + 2023-02-07 c-nullptr Rename this module to nullptr. 2023-01-21 getprogname The include file is changed from "getprogname.h" diff --git a/doc/posix-headers/time.texi b/doc/posix-headers/time.texi index 3d81646454..5ecebbfdda 100644 --- a/doc/posix-headers/time.texi +++ b/doc/posix-headers/time.texi @@ -3,7 +3,7 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/time.h.html} -Gnulib module: time +Gnulib module: time-h Portability problems fixed by Gnulib: @itemize diff --git a/modules/cond b/modules/cond index 43b2bd67de..5f2ea4edec 100644 --- a/modules/cond +++ b/modules/cond @@ -12,7 +12,7 @@ lock errno extern-inline stdbool -time +time-h windows-cond [test $gl_threads_api = windows] configure.ac: diff --git a/modules/ctime b/modules/ctime index 08cc532986..11de22f2d9 100644 --- a/modules/ctime +++ b/modules/ctime @@ -10,7 +10,7 @@ lib/ctime.c m4/ctime.m4 Depends-on: -time +time-h configure.ac: gl_FUNC_CTIME diff --git a/modules/localtime b/modules/localtime index 99a2d00dcd..7880775328 100644 --- a/modules/localtime +++ b/modules/localtime @@ -6,7 +6,7 @@ lib/localtime.c m4/localtime.m4 Depends-on: -time +time-h configure.ac: gl_FUNC_LOCALTIME diff --git a/modules/mktime b/modules/mktime index 7594043e6d..b3ba650a93 100644 --- a/modules/mktime +++ b/modules/mktime @@ -7,7 +7,7 @@ lib/mktime.c m4/mktime.m4 Depends-on: -time +time-h c99 multiarch intprops [test $REPLACE_MKTIME = 1] diff --git a/modules/nanosleep b/modules/nanosleep index 8fa659b752..270bfd46d3 100644 --- a/modules/nanosleep +++ b/modules/nanosleep @@ -6,7 +6,7 @@ lib/nanosleep.c m4/nanosleep.m4 Depends-on: -time +time-h extensions multiarch assert-h [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1] diff --git a/modules/parse-datetime b/modules/parse-datetime index 72aa6af659..ef281dcf30 100644 --- a/modules/parse-datetime +++ b/modules/parse-datetime @@ -23,7 +23,7 @@ mktime nstrftime setenv unsetenv -time +time-h time_r time_rz timegm diff --git a/modules/posixcheck b/modules/posixcheck index fac9fea75b..2615c8597b 100644 --- a/modules/posixcheck +++ b/modules/posixcheck @@ -40,7 +40,7 @@ sys_times sys_utsname sys_wait termios -time +time-h unistd utime-h wchar diff --git a/modules/pthread-h b/modules/pthread-h index a505f8a887..2771f44151 100644 --- a/modules/pthread-h +++ b/modules/pthread-h @@ -11,7 +11,7 @@ extensions extern-inline gen-header sched -time +time-h snippet/c++defs snippet/_Noreturn snippet/arg-nonnull diff --git a/modules/stat-time b/modules/stat-time index 92120ace8c..d4c0378dba 100644 --- a/modules/stat-time +++ b/modules/stat-time @@ -7,7 +7,7 @@ lib/stat-time.c m4/stat-time.m4 Depends-on: -time +time-h errno extensions extern-inline diff --git a/modules/stat-time-tests b/modules/stat-time-tests index aa4e31c35c..0a8193783d 100644 --- a/modules/stat-time-tests +++ b/modules/stat-time-tests @@ -6,7 +6,7 @@ tests/nap.h Depends-on: nanosleep stdckdint -time +time-h unistd configure.ac: diff --git a/modules/strftime-fixes b/modules/strftime-fixes index 38a17fcfc3..626ab04268 100644 --- a/modules/strftime-fixes +++ b/modules/strftime-fixes @@ -6,7 +6,7 @@ lib/strftime-fixes.c m4/strftime-fixes.m4 Depends-on: -time +time-h configure.ac: gl_FUNC_STRFTIME diff --git a/modules/strptime b/modules/strptime index bcbfa27782..4fe2c5ef69 100644 --- a/modules/strptime +++ b/modules/strptime @@ -7,7 +7,7 @@ m4/strptime.m4 m4/tm_gmtoff.m4 Depends-on: -time +time-h extensions sys_time [test $HAVE_STRPTIME = 0] string [test $HAVE_STRPTIME = 0] diff --git a/modules/sys_stat b/modules/sys_stat index d5ab154157..233224e835 100644 --- a/modules/sys_stat +++ b/modules/sys_stat @@ -14,7 +14,7 @@ snippet/arg-nonnull snippet/c++defs snippet/warn-on-use sys_types -time +time-h configure.ac: gl_SYS_STAT_H diff --git a/modules/tempname b/modules/tempname index 292c990dea..25d27f3e56 100644 --- a/modules/tempname +++ b/modules/tempname @@ -19,7 +19,7 @@ mkdir stdbool stdint sys_stat -time +time-h configure.ac: gl_FUNC_GEN_TEMPNAME diff --git a/modules/threads-h b/modules/threads-h index e35a5e265b..50a60dfdab 100644 --- a/modules/threads-h +++ b/modules/threads-h @@ -23,7 +23,7 @@ snippet/c++defs snippet/_Noreturn snippet/arg-nonnull snippet/warn-on-use -time +time-h havelib configure.ac-early: diff --git a/modules/time b/modules/time deleted file mode 100644 index 75ff3a4d8c..0000000000 --- a/modules/time +++ /dev/null @@ -1,84 +0,0 @@ -Description: -A more-standard . - -Files: -lib/time.in.h -m4/time_h.m4 - -Depends-on: -extensions -gen-header -include_next -snippet/arg-nonnull -snippet/c++defs -snippet/warn-on-use -stddef - -configure.ac: -gl_TIME_H -gl_TIME_H_REQUIRE_DEFAULTS -AC_PROG_MKDIR_P - -Makefile.am: -BUILT_SOURCES += time.h - -# We need the following in order to create when the system -# doesn't have one that works with the given compiler. -time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -@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_TIME_H''@|$(NEXT_TIME_H)|g' \ - -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \ - -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \ - -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ - -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ - -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \ - -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ - -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ - -e 's/@''GNULIB_TIMESPEC_GET''@/$(GNULIB_TIMESPEC_GET)/g' \ - -e 's/@''GNULIB_TIMESPEC_GETRES''@/$(GNULIB_TIMESPEC_GETRES)/g' \ - -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ - -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \ - -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \ - -e 's/@''GNULIB_MDA_TZSET''@/$(GNULIB_MDA_TZSET)/g' \ - -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ - -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ - -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ - -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ - -e 's|@''HAVE_TIMESPEC_GET''@|$(HAVE_TIMESPEC_GET)|g' \ - -e 's|@''HAVE_TIMESPEC_GETRES''@|$(HAVE_TIMESPEC_GETRES)|g' \ - -e 's|@''HAVE_TIMEZONE_T''@|$(HAVE_TIMEZONE_T)|g' \ - -e 's|@''REPLACE_CTIME''@|$(REPLACE_CTIME)|g' \ - -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \ - -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \ - -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ - -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ - -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ - -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \ - -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ - -e 's|@''REPLACE_TIMESPEC_GET''@|$(REPLACE_TIMESPEC_GET)|g' \ - -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \ - -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ - -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ - -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ - -e 's|@''UNISTD_H_DEFINES_STRUCT_TIMESPEC''@|$(UNISTD_H_DEFINES_STRUCT_TIMESPEC)|g' \ - -e 's|@''TIME_H_DEFINES_TIME_UTC''@|$(TIME_H_DEFINES_TIME_UTC)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - $(srcdir)/time.in.h > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += time.h time.h-t - -Include: - - -License: -LGPLv2+ - -Maintainer: -all diff --git a/modules/time-c++-tests b/modules/time-c++-tests deleted file mode 100644 index 7a22d92cdc..0000000000 --- a/modules/time-c++-tests +++ /dev/null @@ -1,20 +0,0 @@ -Files: -tests/test-time-c++.cc -tests/test-time-c++2.cc -tests/signature.h - -Status: -c++-test - -Depends-on: -ansi-c++-opt - -configure.ac: - -Makefile.am: -if ANSICXX -TESTS += test-time-c++ -check_PROGRAMS += test-time-c++ -test_time_c___SOURCES = test-time-c++.cc test-time-c++2.cc -test_time_c___LDADD = $(LDADD) $(LIBINTL) $(NANOSLEEP_LIB) $(CLOCK_TIME_LIB) -endif diff --git a/modules/time-h b/modules/time-h new file mode 100644 index 0000000000..75ff3a4d8c --- /dev/null +++ b/modules/time-h @@ -0,0 +1,84 @@ +Description: +A more-standard . + +Files: +lib/time.in.h +m4/time_h.m4 + +Depends-on: +extensions +gen-header +include_next +snippet/arg-nonnull +snippet/c++defs +snippet/warn-on-use +stddef + +configure.ac: +gl_TIME_H +gl_TIME_H_REQUIRE_DEFAULTS +AC_PROG_MKDIR_P + +Makefile.am: +BUILT_SOURCES += time.h + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@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_TIME_H''@|$(NEXT_TIME_H)|g' \ + -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \ + -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \ + -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ + -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ + -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \ + -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ + -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ + -e 's/@''GNULIB_TIMESPEC_GET''@/$(GNULIB_TIMESPEC_GET)/g' \ + -e 's/@''GNULIB_TIMESPEC_GETRES''@/$(GNULIB_TIMESPEC_GETRES)/g' \ + -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ + -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \ + -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \ + -e 's/@''GNULIB_MDA_TZSET''@/$(GNULIB_MDA_TZSET)/g' \ + -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ + -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ + -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ + -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ + -e 's|@''HAVE_TIMESPEC_GET''@|$(HAVE_TIMESPEC_GET)|g' \ + -e 's|@''HAVE_TIMESPEC_GETRES''@|$(HAVE_TIMESPEC_GETRES)|g' \ + -e 's|@''HAVE_TIMEZONE_T''@|$(HAVE_TIMEZONE_T)|g' \ + -e 's|@''REPLACE_CTIME''@|$(REPLACE_CTIME)|g' \ + -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \ + -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \ + -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ + -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ + -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ + -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \ + -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ + -e 's|@''REPLACE_TIMESPEC_GET''@|$(REPLACE_TIMESPEC_GET)|g' \ + -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \ + -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ + -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ + -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ + -e 's|@''UNISTD_H_DEFINES_STRUCT_TIMESPEC''@|$(UNISTD_H_DEFINES_STRUCT_TIMESPEC)|g' \ + -e 's|@''TIME_H_DEFINES_TIME_UTC''@|$(TIME_H_DEFINES_TIME_UTC)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + $(srcdir)/time.in.h > $@-t + $(AM_V_at)mv $@-t $@ +MOSTLYCLEANFILES += time.h time.h-t + +Include: + + +License: +LGPLv2+ + +Maintainer: +all diff --git a/modules/time-h-c++-tests b/modules/time-h-c++-tests new file mode 100644 index 0000000000..814556be60 --- /dev/null +++ b/modules/time-h-c++-tests @@ -0,0 +1,20 @@ +Files: +tests/test-time-h-c++.cc +tests/test-time-h-c++2.cc +tests/signature.h + +Status: +c++-test + +Depends-on: +ansi-c++-opt + +configure.ac: + +Makefile.am: +if ANSICXX +TESTS += test-time-h-c++ +check_PROGRAMS += test-time-h-c++ +test_time_h_c___SOURCES = test-time-h-c++.cc test-time-h-c++2.cc +test_time_h_c___LDADD = $(LDADD) $(LIBINTL) $(NANOSLEEP_LIB) $(CLOCK_TIME_LIB) +endif diff --git a/modules/time-h-tests b/modules/time-h-tests new file mode 100644 index 0000000000..d7bf897c41 --- /dev/null +++ b/modules/time-h-tests @@ -0,0 +1,12 @@ +Files: +tests/test-time-h.c + +Depends-on: +assert-h +time-h-c++-tests + +configure.ac: + +Makefile.am: +TESTS += test-time-h +check_PROGRAMS += test-time-h diff --git a/modules/time-tests b/modules/time-tests deleted file mode 100644 index e367565ece..0000000000 --- a/modules/time-tests +++ /dev/null @@ -1,12 +0,0 @@ -Files: -tests/test-time.c - -Depends-on: -assert-h -time-c++-tests - -configure.ac: - -Makefile.am: -TESTS += test-time -check_PROGRAMS += test-time diff --git a/modules/time_r b/modules/time_r index 6f11b65c95..7d5fddd1f2 100644 --- a/modules/time_r +++ b/modules/time_r @@ -7,7 +7,7 @@ m4/time_r.m4 Depends-on: extensions -time +time-h configure.ac: gl_TIME_R diff --git a/modules/time_rz b/modules/time_rz index fe8a33e699..f487e24c6b 100644 --- a/modules/time_rz +++ b/modules/time_rz @@ -9,7 +9,7 @@ m4/time_rz.m4 Depends-on: c99 extensions -time +time-h flexmember [test $HAVE_TIMEZONE_T = 0] idx [test $HAVE_TIMEZONE_T = 0] setenv [test $HAVE_TIMEZONE_T = 0] diff --git a/modules/timegm b/modules/timegm index 3d8771e58d..738eb40bdb 100644 --- a/modules/timegm +++ b/modules/timegm @@ -7,7 +7,7 @@ lib/timegm.c m4/timegm.m4 Depends-on: -time +time-h mktime-internal [test $HAVE_TIMEGM = 0 || test $REPLACE_TIMEGM = 1] time_r [test $HAVE_TIMEGM = 0 || test $REPLACE_TIMEGM = 1] diff --git a/modules/timespec b/modules/timespec index 6fac24c022..642d2010e7 100644 --- a/modules/timespec +++ b/modules/timespec @@ -9,7 +9,7 @@ m4/timespec.m4 Depends-on: extern-inline snippet/arg-nonnull -time +time-h configure.ac: gl_TIMESPEC diff --git a/modules/timespec_get b/modules/timespec_get index 7b3dc3b01d..b0c5e008f9 100644 --- a/modules/timespec_get +++ b/modules/timespec_get @@ -6,7 +6,7 @@ lib/timespec_get.c m4/timespec_get.m4 Depends-on: -time +time-h extensions gettime [test $HAVE_TIMESPEC_GET = 0 || test $REPLACE_TIMESPEC_GET = 1] diff --git a/modules/timespec_getres b/modules/timespec_getres index 7dc67bab78..07920a414e 100644 --- a/modules/timespec_getres +++ b/modules/timespec_getres @@ -7,7 +7,7 @@ m4/timespec_getres.m4 Depends-on: extensions -time +time-h gettime-res [test $HAVE_TIMESPEC_GETRES = 0] configure.ac: diff --git a/modules/tzset b/modules/tzset index 4997bf0992..ade021195c 100644 --- a/modules/tzset +++ b/modules/tzset @@ -6,7 +6,7 @@ lib/tzset.c m4/tzset.m4 Depends-on: -time +time-h configure.ac: gl_FUNC_TZSET diff --git a/modules/usleep-tests b/modules/usleep-tests index 43241f4b86..531c685eb5 100644 --- a/modules/usleep-tests +++ b/modules/usleep-tests @@ -4,7 +4,7 @@ tests/signature.h tests/macros.h Depends-on: -time +time-h configure.ac: diff --git a/modules/utime b/modules/utime index b61c26a0f8..319b5281e7 100644 --- a/modules/utime +++ b/modules/utime @@ -7,7 +7,7 @@ m4/utime.m4 Depends-on: utime-h -time +time-h filename [test $HAVE_UTIME = 0 || test $REPLACE_UTIME = 1] malloca [test $HAVE_UTIME = 0 || test $REPLACE_UTIME = 1] stat [test $HAVE_UTIME = 0 || test $REPLACE_UTIME = 1] diff --git a/modules/utimecmp b/modules/utimecmp index af6b8c2898..7dd9548a27 100644 --- a/modules/utimecmp +++ b/modules/utimecmp @@ -11,7 +11,7 @@ dirname-lgpl fstatat hash stat-time -time +time-h utimensat intprops stdbool diff --git a/modules/utimens b/modules/utimens index 73f757021e..49e15f6127 100644 --- a/modules/utimens +++ b/modules/utimens @@ -20,7 +20,7 @@ stat-time stdbool sys_stat sys_time -time +time-h utime utime-h diff --git a/modules/windows-cond b/modules/windows-cond index b370bf989a..d9c1aa6605 100644 --- a/modules/windows-cond +++ b/modules/windows-cond @@ -9,7 +9,7 @@ lib/windows-initguard.h Depends-on: stdbool errno -time +time-h gettimeofday configure.ac: diff --git a/modules/windows-timedmutex b/modules/windows-timedmutex index 6c3868c498..c3ed4420b1 100644 --- a/modules/windows-timedmutex +++ b/modules/windows-timedmutex @@ -8,7 +8,7 @@ lib/windows-initguard.h Depends-on: errno -time +time-h gettimeofday configure.ac: diff --git a/modules/windows-timedrecmutex b/modules/windows-timedrecmutex index b17113457f..f61c9e1d0f 100644 --- a/modules/windows-timedrecmutex +++ b/modules/windows-timedrecmutex @@ -8,7 +8,7 @@ lib/windows-initguard.h Depends-on: errno -time +time-h gettimeofday configure.ac: diff --git a/modules/windows-timedrwlock b/modules/windows-timedrwlock index 466e7339b1..bd77756033 100644 --- a/modules/windows-timedrwlock +++ b/modules/windows-timedrwlock @@ -9,7 +9,7 @@ lib/windows-initguard.h Depends-on: errno stdbool -time +time-h gettimeofday configure.ac: diff --git a/modules/xnanosleep b/modules/xnanosleep index 034eab9f2d..80e6a3aa15 100644 --- a/modules/xnanosleep +++ b/modules/xnanosleep @@ -11,7 +11,7 @@ c99 dtotimespec intprops nanosleep -time +time-h unistd configure.ac: diff --git a/tests/test-time-c++.cc b/tests/test-time-c++.cc deleted file mode 100644 index 70b2a0f0c7..0000000000 --- a/tests/test-time-c++.cc +++ /dev/null @@ -1,90 +0,0 @@ -/* Test of substitute in C++ mode. - Copyright (C) 2010-2023 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 , 2010. */ - -#define GNULIB_NAMESPACE gnulib -#include - -#include - -#include "signature.h" - - -#if GNULIB_TEST_TIMESPEC_GET -SIGNATURE_CHECK (GNULIB_NAMESPACE::timespec_get, int, (struct timespec *, int)); -#endif - -#if GNULIB_TEST_NANOSLEEP -SIGNATURE_CHECK (GNULIB_NAMESPACE::nanosleep, int, - (struct timespec const *, struct timespec *)); -#endif - -#if GNULIB_TEST_TZSET -SIGNATURE_CHECK (GNULIB_NAMESPACE::tzset, void, (void)); -#endif - -#if GNULIB_TEST_MKTIME -SIGNATURE_CHECK (GNULIB_NAMESPACE::mktime, time_t, (struct tm *)); -#endif - -#if GNULIB_TEST_TIME_R -SIGNATURE_CHECK (GNULIB_NAMESPACE::localtime_r, struct tm *, - (time_t const *, struct tm *)); - -SIGNATURE_CHECK (GNULIB_NAMESPACE::gmtime_r, struct tm *, - (time_t const *, struct tm *)); -#endif - -#if GNULIB_TEST_LOCALTIME -SIGNATURE_CHECK (GNULIB_NAMESPACE::localtime, struct tm *, (time_t const *)); -#endif - -#if 0 -SIGNATURE_CHECK (GNULIB_NAMESPACE::gmtime, struct tm *, (time_t const *)); -#endif - -#if GNULIB_TEST_STRPTIME -SIGNATURE_CHECK (GNULIB_NAMESPACE::strptime, char *, - (char const *, char const *, struct tm *)); -#endif - -#if GNULIB_TEST_CTIME -SIGNATURE_CHECK (GNULIB_NAMESPACE::ctime, char *, (time_t const *)); -#endif - -#if GNULIB_TEST_STRFTIME -SIGNATURE_CHECK (GNULIB_NAMESPACE::strftime, size_t, - (char *, size_t, const char *, const struct tm *)); -#endif - -#if GNULIB_TEST_TIMERZ -SIGNATURE_CHECK (GNULIB_NAMESPACE::tzalloc, timezone_t, (char const *)); -SIGNATURE_CHECK (GNULIB_NAMESPACE::tzfree, void, (timezone_t)); -SIGNATURE_CHECK (GNULIB_NAMESPACE::localtime_rz, struct tm *, - (timezone_t, time_t const *, struct tm *)); -SIGNATURE_CHECK (GNULIB_NAMESPACE::mktime_z, time_t, (timezone_t, struct tm *)); -#endif - -#if GNULIB_TEST_TIMEGM -SIGNATURE_CHECK (GNULIB_NAMESPACE::timegm, time_t, (struct tm *)); -#endif - - -int -main () -{ -} diff --git a/tests/test-time-c++2.cc b/tests/test-time-c++2.cc deleted file mode 100644 index 7c4dcebafe..0000000000 --- a/tests/test-time-c++2.cc +++ /dev/null @@ -1,20 +0,0 @@ -/* Test of substitute in C++ mode. - Copyright (C) 2010-2023 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 . */ - -#define GNULIB_NAMESPACE gnulib -#include - -#include diff --git a/tests/test-time-h-c++.cc b/tests/test-time-h-c++.cc new file mode 100644 index 0000000000..70b2a0f0c7 --- /dev/null +++ b/tests/test-time-h-c++.cc @@ -0,0 +1,90 @@ +/* Test of substitute in C++ mode. + Copyright (C) 2010-2023 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 , 2010. */ + +#define GNULIB_NAMESPACE gnulib +#include + +#include + +#include "signature.h" + + +#if GNULIB_TEST_TIMESPEC_GET +SIGNATURE_CHECK (GNULIB_NAMESPACE::timespec_get, int, (struct timespec *, int)); +#endif + +#if GNULIB_TEST_NANOSLEEP +SIGNATURE_CHECK (GNULIB_NAMESPACE::nanosleep, int, + (struct timespec const *, struct timespec *)); +#endif + +#if GNULIB_TEST_TZSET +SIGNATURE_CHECK (GNULIB_NAMESPACE::tzset, void, (void)); +#endif + +#if GNULIB_TEST_MKTIME +SIGNATURE_CHECK (GNULIB_NAMESPACE::mktime, time_t, (struct tm *)); +#endif + +#if GNULIB_TEST_TIME_R +SIGNATURE_CHECK (GNULIB_NAMESPACE::localtime_r, struct tm *, + (time_t const *, struct tm *)); + +SIGNATURE_CHECK (GNULIB_NAMESPACE::gmtime_r, struct tm *, + (time_t const *, struct tm *)); +#endif + +#if GNULIB_TEST_LOCALTIME +SIGNATURE_CHECK (GNULIB_NAMESPACE::localtime, struct tm *, (time_t const *)); +#endif + +#if 0 +SIGNATURE_CHECK (GNULIB_NAMESPACE::gmtime, struct tm *, (time_t const *)); +#endif + +#if GNULIB_TEST_STRPTIME +SIGNATURE_CHECK (GNULIB_NAMESPACE::strptime, char *, + (char const *, char const *, struct tm *)); +#endif + +#if GNULIB_TEST_CTIME +SIGNATURE_CHECK (GNULIB_NAMESPACE::ctime, char *, (time_t const *)); +#endif + +#if GNULIB_TEST_STRFTIME +SIGNATURE_CHECK (GNULIB_NAMESPACE::strftime, size_t, + (char *, size_t, const char *, const struct tm *)); +#endif + +#if GNULIB_TEST_TIMERZ +SIGNATURE_CHECK (GNULIB_NAMESPACE::tzalloc, timezone_t, (char const *)); +SIGNATURE_CHECK (GNULIB_NAMESPACE::tzfree, void, (timezone_t)); +SIGNATURE_CHECK (GNULIB_NAMESPACE::localtime_rz, struct tm *, + (timezone_t, time_t const *, struct tm *)); +SIGNATURE_CHECK (GNULIB_NAMESPACE::mktime_z, time_t, (timezone_t, struct tm *)); +#endif + +#if GNULIB_TEST_TIMEGM +SIGNATURE_CHECK (GNULIB_NAMESPACE::timegm, time_t, (struct tm *)); +#endif + + +int +main () +{ +} diff --git a/tests/test-time-h-c++2.cc b/tests/test-time-h-c++2.cc new file mode 100644 index 0000000000..7c4dcebafe --- /dev/null +++ b/tests/test-time-h-c++2.cc @@ -0,0 +1,20 @@ +/* Test of substitute in C++ mode. + Copyright (C) 2010-2023 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 . */ + +#define GNULIB_NAMESPACE gnulib +#include + +#include diff --git a/tests/test-time-h.c b/tests/test-time-h.c new file mode 100644 index 0000000000..2240705bb7 --- /dev/null +++ b/tests/test-time-h.c @@ -0,0 +1,43 @@ +/* Test of substitute. + Copyright (C) 2007, 2009-2023 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 , 2007. */ + +#include + +#include + +/* Check that the types are all defined. */ +struct timespec t1; +#if 0 +/* POSIX:2008 does not require pid_t in unconditionally, and indeed + it's missing on Mac OS X 10.5, FreeBSD 6.4, OpenBSD 4.9, mingw. */ +pid_t t2; +#endif + +/* Check that NULL can be passed through varargs as a pointer type, + per POSIX 2008. */ +static_assert (sizeof NULL == sizeof (void *)); + +/* Check that TIME_UTC is defined and a positive integer. */ +int t3 = TIME_UTC; +static_assert (TIME_UTC > 0); + +int +main (void) +{ + return 0; +} diff --git a/tests/test-time.c b/tests/test-time.c deleted file mode 100644 index 2240705bb7..0000000000 --- a/tests/test-time.c +++ /dev/null @@ -1,43 +0,0 @@ -/* Test of substitute. - Copyright (C) 2007, 2009-2023 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 , 2007. */ - -#include - -#include - -/* Check that the types are all defined. */ -struct timespec t1; -#if 0 -/* POSIX:2008 does not require pid_t in unconditionally, and indeed - it's missing on Mac OS X 10.5, FreeBSD 6.4, OpenBSD 4.9, mingw. */ -pid_t t2; -#endif - -/* Check that NULL can be passed through varargs as a pointer type, - per POSIX 2008. */ -static_assert (sizeof NULL == sizeof (void *)); - -/* Check that TIME_UTC is defined and a positive integer. */ -int t3 = TIME_UTC; -static_assert (TIME_UTC > 0); - -int -main (void) -{ - return 0; -}