diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2012-12-19 21:51:55 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2012-12-19 21:51:55 (GMT) |
| commit | 7b5b6d239e5f7a9f5317bc1df521468823db53f8 (patch) | |
| tree | 11a5030f6e12dff457e56e95d7ee07ac2625a37f /src/H5private.h | |
| parent | a50b051538a76ccfcf427b5fbf9b95e1ba8e81e4 (diff) | |
| download | hdf5-7b5b6d239e5f7a9f5317bc1df521468823db53f8.zip hdf5-7b5b6d239e5f7a9f5317bc1df521468823db53f8.tar.gz hdf5-7b5b6d239e5f7a9f5317bc1df521468823db53f8.tar.bz2 | |
[svn-r23111] Purpose:
Fixes for HDF5 1.8.10 p1
HDFFV-7975
Changed the max single I/O operation size on Darwin/Mac OS X.
HDFFV-8124 and HDFFV-8158
Fixed a core VFD bug when large blocks of data are read.
HDFFV-8246
Added more fields to the VFD read/write error messages.
Tested on:
64-bit Windows 7, Visual Studio 2010, CMake
64-bit Mac OS X Snow Leopard (Fred), Fortran, C++
64-bit BE Linux (Ostrich), Fortran, C++
32-bit LE Linux (jam), Fortran, C++ (also parallel w/ Fortran)
Diffstat (limited to 'src/H5private.h')
| -rw-r--r-- | src/H5private.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/H5private.h b/src/H5private.h index 7dfd349..bff4e59 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -430,6 +430,24 @@ #define HSSIZET_MIN (~(HSSIZET_MAX)) /* + * Types and max sizes for POSIX I/O. + * OS X (Darwin) is odd since the max I/O size does not match the types. + */ +#if defined(H5_HAVE_WIN32_API) +# define h5_posix_io_t unsigned int +# define h5_posix_io_ret_t int +# define H5_POSIX_MAX_IO_BYTES INT_MAX +#elif defined(H5_HAVE_DARWIN) +# define h5_posix_io_t size_t +# define h5_posix_io_ret_t ssize_t +# define H5_POSIX_MAX_IO_BYTES INT_MAX +#else +# define h5_posix_io_t size_t +# define h5_posix_io_ret_t ssize_t +# define H5_POSIX_MAX_IO_BYTES SSIZET_MAX +#endif + +/* * A macro to portably increment enumerated types. */ #ifndef H5_INC_ENUM |