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 /windows | |
| 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 'windows')
| -rwxr-xr-x | windows/src/H5pubconf.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h index c84ebac..ad4ea72 100755 --- a/windows/src/H5pubconf.h +++ b/windows/src/H5pubconf.h @@ -71,7 +71,7 @@ /* #undef H5_FP_TO_ULLONG_RIGHT_MAXIMUM 1 */ /* Define if gettimeofday() populates the tz pointer passed in */ -/* #undef H5_GETTIMEOFDAY_GIVES_TZ */ +#define H5_GETTIMEOFDAY_GIVES_TZ 1 /* Define to 1 if you have the `alarm' function. */ /* #undef H5_HAVE_ALARM */ @@ -169,7 +169,7 @@ /* #undef H5_HAVE_GETTEXTINFO */ /* Define to 1 if you have the `gettimeofday' function. */ -/* #undef H5_HAVE_GETTIMEOFDAY */ +#define H5_HAVE_GETTIMEOFDAY /* Define to 1 if you have the `get_fpc_csr' function. */ /* #undef H5_HAVE_GET_FPC_CSR */ @@ -311,7 +311,7 @@ /* #undef H5_HAVE_STRUCT_TEXT_INFO */ /* Define if `struct timezone' is defined */ -/* #undef H5_HAVE_STRUCT_TIMEZONE */ +#define H5_HAVE_STRUCT_TIMEZONE 1 /* Define to 1 if `tm_zone' is member of `struct tm'. */ /* #undef H5_HAVE_STRUCT_TM_TM_ZONE */ |