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 /config | |
| 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 'config')
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index fce4900..f1883cd 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -175,8 +175,10 @@ IF (WINDOWS) SET (H5_STDC_HEADERS 1) SET (H5_HAVE_GETHOSTNAME 1) SET (H5_HAVE_GETCONSOLESCREENBUFFERINFO 1) - SET (H5_HAVE_TIMEZONE 1) SET (H5_HAVE_FUNCTION 1) + SET (H5_GETTIMEOFDAY_GIVES_TZ 1) + SET (H5_HAVE_TIMEZONE 1) + SET (H5_HAVE_GETTIMEOFDAY 1) SET (H5_LONE_COLON 0) ENDIF (WINDOWS) |