summaryrefslogtreecommitdiffstats
path: root/src/H5SMprivate.h
diff options
context:
space:
mode:
authorNeil Fortner <nfortne2@hdfgroup.org>2011-10-20 22:20:00 (GMT)
committerNeil Fortner <nfortne2@hdfgroup.org>2011-10-20 22:20:00 (GMT)
commitc36a79fd91206a67cc159e6881cb1b9fce2d2b83 (patch)
tree3733581c711178e6cd0f23ee0fdfa9959e1896f5 /src/H5SMprivate.h
parentfd619754ac6c01025528e878497aae032b9a5b78 (diff)
downloadhdf5-c36a79fd91206a67cc159e6881cb1b9fce2d2b83.zip
hdf5-c36a79fd91206a67cc159e6881cb1b9fce2d2b83.tar.gz
hdf5-c36a79fd91206a67cc159e6881cb1b9fce2d2b83.tar.bz2
[svn-r21631] Port revisions 21629 and 21630 to 1.8 branch
Purpose: Update fix committed in r21556 Description: An old patch was mistakenly committed in r21556. Replaced this fix with the latest. Tested: jam, koala, heiwa (h5committest)
Diffstat (limited to 'src/H5SMprivate.h')
-rwxr-xr-xsrc/H5SMprivate.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/H5SMprivate.h b/src/H5SMprivate.h
index 5fc9915..dddc0a8 100755
--- a/src/H5SMprivate.h
+++ b/src/H5SMprivate.h
@@ -26,6 +26,16 @@
#include "H5Oprivate.h" /* Object headers */
#include "H5Pprivate.h" /* Property lists */
+/**************************/
+/* Library Private Macros */
+/**************************/
+
+/* Flags for the "defer_flags" argument to H5SM_try_share
+ */
+#define H5SM_DEFER 0x01u /* Don't actually write shared message to index, heap; just update shared info */
+#define H5SM_WAS_DEFERRED 0x02u /* Message was previously updated by a call to H5SM_try_share with H5SM_DEFER */
+
+
/****************************/
/* Library Private Typedefs */
/****************************/
@@ -44,7 +54,7 @@ H5_DLL herr_t H5SM_init(H5F_t *f, H5P_genplist_t *fc_plist,
H5_DLL htri_t H5SM_can_share(H5F_t *f, hid_t dxpl_id, H5SM_master_table_t *table,
ssize_t *sohm_index_num, unsigned type_id, const void *mesg);
H5_DLL htri_t H5SM_try_share(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
- hbool_t defer, unsigned type_id, void *mesg, unsigned *mesg_flags);
+ unsigned defer_flags, unsigned type_id, void *mesg, unsigned *mesg_flags);
H5_DLL herr_t H5SM_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
H5O_shared_t *sh_mesg);
H5_DLL herr_t H5SM_get_info(const H5O_loc_t *ext_loc, H5P_genplist_t *fc_plist,