diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-03-24 17:21:42 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-03-24 17:21:42 (GMT) |
| commit | f960ff573ea4d7c324be7a392f0b0c85bc796030 (patch) | |
| tree | 9ad7d7baac484f4feccd6586fd5cc7e4beeead97 /src | |
| parent | b2120ac99316bc065a13e1ae3411eb968663a2f8 (diff) | |
| download | hdf5-f960ff573ea4d7c324be7a392f0b0c85bc796030.zip hdf5-f960ff573ea4d7c324be7a392f0b0c85bc796030.tar.gz hdf5-f960ff573ea4d7c324be7a392f0b0c85bc796030.tar.bz2 | |
[svn-r20312] Change incorrect use of "struct stat" to use "h5_stat_t".
Also removed includes from top of file - they are included with proper config checks in h5private.h.
Changed name of Windows only gettimeofday function to avoid a define loop according to VS2008
Tested: local linux, windows
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5system.c | 4 | ||||
| -rw-r--r-- | src/H5win32defs.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/H5system.c b/src/H5system.c index 7776cbb..02ea625 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -584,7 +584,7 @@ HDremove_all(const char *fname) #endif /*------------------------------------------------------------------------- - * Function: HDgettimeofday + * Function: Wgettimeofday * * Purpose: Wrapper function for gettimeofday on Windows systems * @@ -610,7 +610,7 @@ HDremove_all(const char *fname) #define _W32_FT_OFFSET (116444736000000000ULL) int -HDgettimeofday(struct timeval *tv, void *tz) +Wgettimeofday(struct timeval *tv, void *tz) { union { unsigned long long ns100; /*time since 1 Jan 1601 in 100ns units */ diff --git a/src/H5win32defs.h b/src/H5win32defs.h index fb37059..6ccc86a 100644 --- a/src/H5win32defs.h +++ b/src/H5win32defs.h @@ -48,11 +48,11 @@ typedef __int64 h5_stat_size_t; #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ - H5_DLL int HDgettimeofday(struct timeval *tv, void *tz); + H5_DLL int Wgettimeofday(struct timeval *tv, void *tz); #ifdef __cplusplus } #endif /* __cplusplus */ - #define HDgettimeofday(V,Z) HDgettimeofday(V,Z) + #define HDgettimeofday(V,Z) Wgettimeofday(V,Z) #endif /* H5_HAVE_GETTIMEOFDAY */ #define HDgetdrive() _getdrive() #define HDlseek(F,O,W) _lseeki64(F,O,W) |