diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2019-03-15 15:47:02 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2019-03-15 15:47:02 (GMT) |
commit | d2591ce377bb027d210a100c5a738e3cdd82378e (patch) | |
tree | c8a4cf3b5a11d712ae095a1daf58a4a0771ee5ec /tools/test | |
parent | a0c5d9a1d3ffbff3c78982a4d08bd8f1550f535d (diff) | |
parent | 0c20c65e2f3abf390ad87c9167daca4cdff2de39 (diff) | |
download | hdf5-d2591ce377bb027d210a100c5a738e3cdd82378e.zip hdf5-d2591ce377bb027d210a100c5a738e3cdd82378e.tar.gz hdf5-d2591ce377bb027d210a100c5a738e3cdd82378e.tar.bz2 |
Merge pull request #1602 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:wopen_squash to develop
* commit '0c20c65e2f3abf390ad87c9167daca4cdff2de39':
Added the HDopen work-around on windows to pio_engine.c
Adds _wopen support on Windows so that files with UTF-8 names can be opened.
Diffstat (limited to 'tools/test')
-rw-r--r-- | tools/test/perform/pio_engine.c | 6 | ||||
-rw-r--r-- | tools/test/perform/sio_engine.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/tools/test/perform/pio_engine.c b/tools/test/perform/pio_engine.c index 1c0d621..43a0f64 100644 --- a/tools/test/perform/pio_engine.c +++ b/tools/test/perform/pio_engine.c @@ -82,6 +82,12 @@ /* POSIX I/O macros */ +#ifdef H5_HAVE_WIN32_API +/* Can't link against the library, so this test will use the older, non-Unicode + * _open() call on Windows. + */ +#define HDopen(S,F,...) _open(S, F | _O_BINARY, __VA_ARGS__) +#endif /* H5_HAVE_WIN32_API */ #define POSIXCREATE(fn) HDopen(fn, O_CREAT|O_TRUNC|O_RDWR, 0600) #define POSIXOPEN(fn, F) HDopen(fn, F, 0600) #define POSIXCLOSE(F) HDclose(F) diff --git a/tools/test/perform/sio_engine.c b/tools/test/perform/sio_engine.c index 4fead3f..11de229 100644 --- a/tools/test/perform/sio_engine.c +++ b/tools/test/perform/sio_engine.c @@ -54,6 +54,12 @@ } while(0) /* POSIX I/O macros */ +#ifdef H5_HAVE_WIN32_API +/* Can't link against the library, so this test will use the older, non-Unicode + * _open() call on Windows. + */ +#define HDopen(S,F,...) _open(S, F | _O_BINARY, __VA_ARGS__) +#endif /* H5_HAVE_WIN32_API */ #define POSIXCREATE(fn) HDopen(fn, O_CREAT|O_TRUNC|O_RDWR, 0600) #define POSIXOPEN(fn, F) HDopen(fn, F, 0600) #define POSIXCLOSE(F) HDclose(F) |