diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2011-04-14 19:33:15 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2011-04-14 19:33:15 (GMT) |
| commit | 9978868c117845a1a54a516ca5cc9657c83a83c1 (patch) | |
| tree | ec6dbcefd6dae1b63d0ae012f07ae81e308adf99 /src/H5timer.c | |
| parent | 2a5e9f353fedaeb5ba5fdfac77c78a89342655db (diff) | |
| download | hdf5-9978868c117845a1a54a516ca5cc9657c83a83c1.zip hdf5-9978868c117845a1a54a516ca5cc9657c83a83c1.tar.gz hdf5-9978868c117845a1a54a516ca5cc9657c83a83c1.tar.bz2 | |
[svn-r20499] Fixes erroneous H5_HAVE_GETTIMEOFDAY behavior on Windows (JIRA HDFFV-5931). Previously, H5_HAVE_GETTIMEOFDAY was never properly defined. The timezone struct and Wgettimeofday() timezone output was also added.
This is a merge of several changesets from the log_vfd branch where this work took place: 20355, 20359, 20411, 20413, 20431, 20460
Tested on: Windows
Diffstat (limited to 'src/H5timer.c')
| -rw-r--r-- | src/H5timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5timer.c b/src/H5timer.c index 8334402..7bdee8a 100644 --- a/src/H5timer.c +++ b/src/H5timer.c @@ -39,9 +39,9 @@ # include <sys/resource.h> #endif -#ifdef H5_HAVE_GETTIMEOFDAY +#if defined(H5_HAVE_GETTIMEOFDAY) && defined(H5_HAVE_SYS_TIME_H) #include <sys/time.h> -#endif /* H5_HAVE_GETTIMEOFDAY */ +#endif /****************/ |