diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-01-29 17:57:53 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-01-29 17:57:53 (GMT) |
| commit | 6a566cdc8457eed5c0b80f8e7a82b6efcea51fe7 (patch) | |
| tree | 43e17da7304d4a2c300a584c6a093f9c98995afb /src | |
| parent | 6dc56e664bfd9d71951842cf006b7a76eb35cc34 (diff) | |
| download | hdf5-6a566cdc8457eed5c0b80f8e7a82b6efcea51fe7.zip hdf5-6a566cdc8457eed5c0b80f8e7a82b6efcea51fe7.tar.gz hdf5-6a566cdc8457eed5c0b80f8e7a82b6efcea51fe7.tar.bz2 | |
[svn-r29019] Fixed double declaration of a few types that only appears on Windows.
Tested on: 64-bit Windows 10 with VS 2015 Pro
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5private.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/H5private.h b/src/H5private.h index 4ce6431..c78e72c 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -885,9 +885,15 @@ H5_DLL int HDfprintf (FILE *stream, const char *fmt, ...); #define HDstat(S,B) stat(S,B) #endif /* HDstat */ +#ifndef H5_HAVE_WIN32_API +/* These definitions differ in Windows and are defined in + * H5win32defs for that platform. + */ typedef struct stat h5_stat_t; typedef off_t h5_stat_size_t; -#define HDoff_t off_t +#define HDoff_t off_t +#endif /* H5_HAVE_WIN32_API */ + #define H5_SIZEOF_H5_STAT_SIZE_T H5_SIZEOF_OFF_T #ifndef HDftell |