diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2011-04-14 19:39:03 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2011-04-14 19:39:03 (GMT) |
| commit | b2aed7a836370bebdb28c79219c23fff8f038d44 (patch) | |
| tree | 65ebd17d38a2a7b3244848885394b796f995c71c /src/H5win32defs.h | |
| parent | 9062c8583fa0ecb1609f9f3847fb6ac2bd16497c (diff) | |
| download | hdf5-b2aed7a836370bebdb28c79219c23fff8f038d44.zip hdf5-b2aed7a836370bebdb28c79219c23fff8f038d44.tar.gz hdf5-b2aed7a836370bebdb28c79219c23fff8f038d44.tar.bz2 | |
[svn-r20500] Merge of 20499 from trunk to fix Windows H5_HAVE_GETTIMEOFDAY issues (HDFFV-5931).
Tested on: Windows
Diffstat (limited to 'src/H5win32defs.h')
| -rw-r--r-- | src/H5win32defs.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/H5win32defs.h b/src/H5win32defs.h index 6ccc86a..a428899 100644 --- a/src/H5win32defs.h +++ b/src/H5win32defs.h @@ -44,16 +44,21 @@ typedef __int64 h5_stat_size_t; #define HDstat(S,B) _stati64(S,B) #define HDgetcwd(S,Z) _getcwd(S,Z) #define HDgetdcwd(D,S,Z) _getdcwd(D,S,Z) -#ifndef H5_HAVE_GETTIMEOFDAY - #ifdef __cplusplus + +struct timezone { + int tz_minuteswest; + int tz_dsttime; +}; + +#ifdef __cplusplus extern "C" { - #endif /* __cplusplus */ - H5_DLL int Wgettimeofday(struct timeval *tv, void *tz); - #ifdef __cplusplus +#endif /* __cplusplus */ +H5_DLL int Wgettimeofday(struct timeval *tv, struct timezone *tz); +#ifdef __cplusplus } - #endif /* __cplusplus */ - #define HDgettimeofday(V,Z) Wgettimeofday(V,Z) -#endif /* H5_HAVE_GETTIMEOFDAY */ +#endif /* __cplusplus */ +#define HDgettimeofday(V,Z) Wgettimeofday(V,Z) + #define HDgetdrive() _getdrive() #define HDlseek(F,O,W) _lseeki64(F,O,W) #define HDoff_t __int64 |