From 6a566cdc8457eed5c0b80f8e7a82b6efcea51fe7 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Fri, 29 Jan 2016 12:57:53 -0500 Subject: [svn-r29019] Fixed double declaration of a few types that only appears on Windows. Tested on: 64-bit Windows 10 with VS 2015 Pro --- src/H5private.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 -- cgit v0.12