summaryrefslogtreecommitdiffstats
path: root/src/H5system.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2011-04-14 19:33:15 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2011-04-14 19:33:15 (GMT)
commit9978868c117845a1a54a516ca5cc9657c83a83c1 (patch)
treeec6dbcefd6dae1b63d0ae012f07ae81e308adf99 /src/H5system.c
parent2a5e9f353fedaeb5ba5fdfac77c78a89342655db (diff)
downloadhdf5-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/H5system.c')
-rw-r--r--src/H5system.c21
1 files changed, 16 insertions, 5 deletions
diff --git a/src/H5system.c b/src/H5system.c
index 02ea625..afe07b0 100644
--- a/src/H5system.c
+++ b/src/H5system.c
@@ -604,25 +604,36 @@ HDremove_all(const char *fname)
*
*-------------------------------------------------------------------------
*/
-#if !defined(H5_HAVE_GETTIMEOFDAY) && defined(_WIN32)
+#ifdef _WIN32
-/* Offset between 1/1/1601 and 1/1/1970 in 100 nanosec units */
+/* Offset between 1/1/1601 and 1/1/1970 in 100 nanosecond units */
#define _W32_FT_OFFSET (116444736000000000ULL)
int
-Wgettimeofday(struct timeval *tv, void *tz)
+Wgettimeofday(struct timeval *tv, struct timezone *tz)
{
union {
unsigned long long ns100; /*time since 1 Jan 1601 in 100ns units */
FILETIME ft;
} _now;
- if(tv)
- {
+ static int tzsetflag;
+
+ if(tv) {
GetSystemTimeAsFileTime (&_now.ft);
tv->tv_usec=(long)((_now.ns100 / 10ULL) % 1000000ULL );
tv->tv_sec= (long)((_now.ns100 - _W32_FT_OFFSET) / 10000000ULL);
}
+
+ if(tz) {
+ if(!tzsetflag) {
+ _tzset();
+ tzsetflag = 1;
+ }
+ tz->tz_minuteswest = _timezone / 60;
+ tz->tz_dsttime = _daylight;
+ }
+
/* Always return 0 as per Open Group Base Specifications Issue 6.
Do not set errno on error. */
return 0;