diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2016-02-10 17:55:55 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-02-10 17:55:55 (GMT) |
| commit | c8a6c6030a768952bc4161b2bf30c948b8b58723 (patch) | |
| tree | 064e57faf3f85c030d70900c3354fee2fbffd8ac /src/H5Pdxpl.c | |
| parent | f1283d59b061cde641f2c24d23f01efbca46ad2f (diff) | |
| download | hdf5-c8a6c6030a768952bc4161b2bf30c948b8b58723.zip hdf5-c8a6c6030a768952bc4161b2bf30c948b8b58723.tar.gz hdf5-c8a6c6030a768952bc4161b2bf30c948b8b58723.tar.bz2 | |
[svn-r29077] Description:
Normalize against the trunk, in preparation for final merge.
Tested on:
MacOSX/64 10.11.3 (amazon) w/serial & parallel
(h5committest not required on this branch)
Diffstat (limited to 'src/H5Pdxpl.c')
| -rw-r--r-- | src/H5Pdxpl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c index 535e34b..9353094 100644 --- a/src/H5Pdxpl.c +++ b/src/H5Pdxpl.c @@ -179,7 +179,6 @@ #ifdef H5_DEBUG_BUILD /* dxpl I/O type - private property */ #define H5FD_DXPL_TYPE_SIZE sizeof(H5FD_dxpl_type_t) -#define H5FD_DXPL_TYPE_DEF H5FD_NOIO_DXPL #endif /* H5_DEBUG_BUILD */ #ifdef H5_HAVE_PARALLEL /* Definition for reading metadata collectively */ @@ -187,7 +186,9 @@ #define H5D_XFER_COLL_MD_READ_DEF H5P_USER_FALSE #define H5D_XFER_COLL_MD_READ_ENC H5P__encode_coll_md_read_flag_t #define H5D_XFER_COLL_MD_READ_DEC H5P__decode_coll_md_read_flag_t -#endif H5_HAVE_PARALLEL +#endif /* H5_HAVE_PARALLEL */ + + /******************/ /* Local Typedefs */ /******************/ |