diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-07-12 19:25:33 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-07-17 16:58:02 (GMT) |
| commit | 7a9c852c2c1be7fd0b7c3a97b3e7f81227b35b43 (patch) | |
| tree | 1aa67a97fbe2e3dba7e469917fd6020465dda591 /src | |
| parent | 7174b5c135f39b448925551c433cb60fc618d7af (diff) | |
| download | hdf5-7a9c852c2c1be7fd0b7c3a97b3e7f81227b35b43.zip hdf5-7a9c852c2c1be7fd0b7c3a97b3e7f81227b35b43.tar.gz hdf5-7a9c852c2c1be7fd0b7c3a97b3e7f81227b35b43.tar.bz2 | |
HDFFV-8631, HDFFV-10595, HDFFV-10845
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5win32defs.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/H5win32defs.h b/src/H5win32defs.h index 2ae2575..d439379 100644 --- a/src/H5win32defs.h +++ b/src/H5win32defs.h @@ -52,7 +52,11 @@ typedef __int64 h5_stat_size_t; /* Note that the variadic HDopen macro is using a VC++ extension * where the comma is dropped if nothing is passed to the ellipsis. */ +#ifndef H5_HAVE_MINGW #define HDopen(S,F,...) Wopen_utf8(S,F,__VA_ARGS__) +#else +#define HDopen(S,F,...) Wopen_utf8(S,F,##__VA_ARGS__) +#endif #define HDread(F,M,Z) _read(F,M,Z) #define HDremove(S) Wremove_utf8(S) #define HDrmdir(S) _rmdir(S) @@ -128,7 +132,7 @@ extern "C" { H5_DLL int Wnanosleep(const struct timespec *req, struct timespec *rem); H5_DLL herr_t H5_expand_windows_env_vars(char **env_var); H5_DLL const wchar_t *H5_get_utf16_str(const char *s); - H5_DLL int Wopen_utf8(const char *path, int oflag, ...); + H5_DLL int Wopen_utf8(const char *path, int oflag, ...); H5_DLL int Wremove_utf8(const char *path); /* Round functions only needed for VS2012 and earlier. |