diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-02-19 16:48:42 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-02-19 16:48:42 (GMT) |
| commit | 1c8dfd918b2baaeb5c3ce228be71c565f324ec55 (patch) | |
| tree | bf54cb7fa4839b796cf07878a288aa64b50d7633 | |
| parent | 649616ed99fab7e6d9cbc0ba11a5bff295cc18eb (diff) | |
| download | hdf5-1c8dfd918b2baaeb5c3ce228be71c565f324ec55.zip hdf5-1c8dfd918b2baaeb5c3ce228be71c565f324ec55.tar.gz hdf5-1c8dfd918b2baaeb5c3ce228be71c565f324ec55.tar.bz2 | |
[svn-r29159] Merge of r29019 from trunk.
Fixes double declaration of a couple of types from the LFS changes.
Tested on: 64-bit Windows 10 w/ VS 2015 Pro
| -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 86d3b70..b4fbc26 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 |