diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2021-06-30 15:18:01 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-30 15:18:01 (GMT) |
| commit | 257c8c745446ee614f92624b30cec41d8d771e05 (patch) | |
| tree | 8aa5ed161f822520e6e0beffd9545d450cba1f6b | |
| parent | f0e0c7ed2a2df6d6dbe3728002c7fc9c518fea5f (diff) | |
| download | hdf5-257c8c745446ee614f92624b30cec41d8d771e05.zip hdf5-257c8c745446ee614f92624b30cec41d8d771e05.tar.gz hdf5-257c8c745446ee614f92624b30cec41d8d771e05.tar.bz2 | |
Removes remaining H5_TIME_WITH_SYS_TIME cruft (#810)
Mostly from CMake
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 3 | ||||
| -rw-r--r-- | config/cmake_ext_mod/ConfigureChecks.cmake | 1 | ||||
| -rw-r--r-- | tools/lib/io_timer.h | 9 | ||||
| -rw-r--r-- | tools/test/perform/direct_write_perf.c | 21 | ||||
| -rw-r--r-- | tools/test/perform/perf.c | 21 |
5 files changed, 23 insertions, 32 deletions
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index 051272b..35ff8cf 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -634,9 +634,6 @@ PTHREAD_SCOPE_SYSTEM) call. */ #cmakedefine H5_SYSTEM_SCOPE_THREADS @H5_SYSTEM_SCOPE_THREADS@ -/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ -#cmakedefine H5_TIME_WITH_SYS_TIME @H5_TIME_WITH_SYS_TIME@ - /* Define using v1.10 public API symbols by default */ #cmakedefine H5_USE_110_API_DEFAULT @H5_USE_110_API_DEFAULT@ diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake index ccf7c85..fca38a4 100644 --- a/config/cmake_ext_mod/ConfigureChecks.cmake +++ b/config/cmake_ext_mod/ConfigureChecks.cmake @@ -412,7 +412,6 @@ if (MINGW OR NOT WINDOWS) #----------------------------------------------------------------------------- CHECK_STRUCT_HAS_MEMBER("struct tm" tm_gmtoff "time.h" ${HDF_PREFIX}_HAVE_TM_GMTOFF) CHECK_STRUCT_HAS_MEMBER("struct tm" __tm_gmtoff "time.h" ${HDF_PREFIX}_HAVE___TM_GMTOFF) - CHECK_STRUCT_HAS_MEMBER("struct tm" tm_sec "sys/types.h;sys/time.h;time.h" ${HDF_PREFIX}_TIME_WITH_SYS_TIME) if (${HDF_PREFIX}_HAVE_SYS_TIME_H) CHECK_STRUCT_HAS_MEMBER("struct tm" tz_minuteswest "sys/types.h;sys/time.h;time.h" ${HDF_PREFIX}_HAVE_STRUCT_TIMEZONE) else () diff --git a/tools/lib/io_timer.h b/tools/lib/io_timer.h index 0269b93..75db660 100644 --- a/tools/lib/io_timer.h +++ b/tools/lib/io_timer.h @@ -16,18 +16,15 @@ #include "hdf5.h" -#if defined(H5_TIME_WITH_SYS_TIME) -#include <sys/time.h> #include <time.h> -#elif defined(H5_HAVE_SYS_TIME_H) + +#ifdef H5_HAVE_SYS_TIME_H #include <sys/time.h> -#else -#include <time.h> #endif #ifdef H5_HAVE_WINSOCK2_H #include <winsock2.h> -#endif /* H5_HAVE_WINSOCK2_H */ +#endif /* The different types of timers we can have */ typedef enum timer_type_ { diff --git a/tools/test/perform/direct_write_perf.c b/tools/test/perform/direct_write_perf.c index df29fc9..371c4f9 100644 --- a/tools/test/perform/direct_write_perf.c +++ b/tools/test/perform/direct_write_perf.c @@ -28,23 +28,22 @@ #include <math.h> #include <stdio.h> #include <stdlib.h> - -#ifdef H5_HAVE_UNISTD_H -#include <sys/types.h> -#include <unistd.h> -#endif +#include <time.h> #ifdef H5_HAVE_SYS_STAT_H #include <sys/stat.h> #endif -#if defined(H5_TIME_WITH_SYS_TIME) -#include <sys/time.h> -#include <time.h> -#elif defined(H5_HAVE_SYS_TIME_H) +#ifdef H5_HAVE_SYS_TIME_H #include <sys/time.h> -#else -#include <time.h> +#endif + +#ifdef H5_HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif + +#ifdef H5_HAVE_UNISTD_H +#include <unistd.h> #endif const char *FILENAME[] = {"direct_write", "unix.raw", NULL}; diff --git a/tools/test/perform/perf.c b/tools/test/perform/perf.c index a19e5d5..875f932 100644 --- a/tools/test/perform/perf.c +++ b/tools/test/perform/perf.c @@ -31,23 +31,22 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> - -#ifdef H5_HAVE_UNISTD_H -#include <sys/types.h> -#include <unistd.h> -#endif +#include <time.h> #ifdef H5_HAVE_SYS_STAT_H #include <sys/stat.h> #endif -#if defined(H5_TIME_WITH_SYS_TIME) -#include <sys/time.h> -#include <time.h> -#elif defined(H5_HAVE_SYS_TIME_H) +#ifdef H5_HAVE_SYS_TIME_H #include <sys/time.h> -#else -#include <time.h> +#endif + +#ifdef H5_HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif + +#ifdef H5_HAVE_UNISTD_H +#include <unistd.h> #endif #include <mpi.h> |