mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removes remaining H5_TIME_WITH_SYS_TIME cruft (#810)

Browse Source 
Mostly from CMake
This commit is contained in:
Dana Robinson 2021-06-30 08:18:01 -07:00 committed by GitHub
parent f0e0c7ed2a
commit 257c8c7454
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/cmake/H5pubconf.h.in
View File

@ -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@

1
config/cmake_ext_mod/ConfigureChecks.cmake
View File

@ -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 ()

9
tools/lib/io_timer.h
View File

@ -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_ {

21
tools/test/perform/direct_write_perf.c
View File

@ -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)
#ifdef H5_HAVE_SYS_TIME_H
#include <sys/time.h>
#include <time.h>
#elif defined(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};

21
tools/test/perform/perf.c
View File

@ -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)
#ifdef H5_HAVE_SYS_TIME_H
#include <sys/time.h>
#include <time.h>
#elif defined(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>