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/H5ACprivate.h | |
| 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/H5ACprivate.h')
| -rw-r--r-- | src/H5ACprivate.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h index 7481f0a..71ddcf3 100644 --- a/src/H5ACprivate.h +++ b/src/H5ACprivate.h @@ -181,13 +181,6 @@ typedef H5C_cache_entry_t H5AC_info_t; /* Typedef for metadata cache (defined in H5Cpkg.h) */ typedef H5C_t H5AC_t; -#ifdef H5_HAVE_PARALLEL -/* Definitions for "collective metadata write" property */ -#define H5AC_COLLECTIVE_META_WRITE_NAME "H5AC_collective_metadata_write" -#define H5AC_COLLECTIVE_META_WRITE_SIZE sizeof(hbool_t) -#define H5AC_COLLECTIVE_META_WRITE_DEF 0 -#endif /* H5_HAVE_PARALLEL */ - #define H5AC_METADATA_TAG_NAME "H5AC_metadata_tag" #define H5AC_METADATA_TAG_SIZE sizeof(haddr_t) #define H5AC_METADATA_TAG_DEF H5AC__INVALID_TAG @@ -196,17 +189,17 @@ typedef H5C_t H5AC_t; /* Dataset transfer property list for metadata calls */ H5_DLLVAR hid_t H5AC_dxpl_id; -extern hid_t H5AC_ind_read_dxpl_id; +H5_DLLVAR hid_t H5AC_ind_read_dxpl_id; #ifdef H5_HAVE_PARALLEL -extern hid_t H5AC_coll_read_dxpl_id; +H5_DLLVAR hid_t H5AC_coll_read_dxpl_id; #endif /* H5_HAVE_PARALLEL */ /* DXPL to be used in operations that will not result in I/O calls */ -extern hid_t H5AC_noio_dxpl_id; +H5_DLLVAR hid_t H5AC_noio_dxpl_id; /* DXPL to be used for raw data I/O operations when one is not provided by the user (fill values in H5Dcreate) */ -extern hid_t H5AC_rawdata_dxpl_id; +H5_DLLVAR hid_t H5AC_rawdata_dxpl_id; /* Default cache configuration. */ |