[svn-r18503] Description:

	Bring r18502 from trunk to 1.8 branch:

	Bring r18501 from metadata journaling "merging" branch to trunk:

	Extract data structure 'destroy' routines from metadata cache client
'destroy' callbacks.

Tested on:
	FreeBSD/32 6.3 (duty) w/debug
	(h5committested on trunk)

1 files changed, 5 insertions, 1 deletions

diff --git a/src/H5HGpkg.h b/src/H5HGpkg.h
index 96be009..7ce18c9 100644
--- a/src/H5HGpkg.h
+++ b/src/H5HGpkg.h
@@ -128,6 +128,9 @@ typedef struct H5HG_obj_t {
     uint8_t		*begin;		/*ptr to object into heap->chunk*/
 } H5HG_obj_t;
 
+/* Forward declarations for fields */
+struct H5F_file_t;
+
 struct H5HG_heap_t {
     H5AC_info_t cache_info; /* Information for H5AC cache functions, _must_ be */
                             /* first field in structure */
@@ -139,13 +142,14 @@ struct H5HG_heap_t {
                                         /* If this value is >65535 then all indices */
                                         /* have been used at some time and the */
                                         /* correct new index should be searched for */
+    struct H5F_file_t   *shared;        /* shared file */
     H5HG_obj_t	*obj;		/*array of object descriptions	*/
 };
 
 /******************************/
 /* Package Private Prototypes */
 /******************************/
-H5_DLL herr_t H5HG_dest(H5F_t *f, H5HG_heap_t *heap);
+H5_DLL herr_t H5HG_free(H5HG_heap_t *heap);
 
 #endif /* _H5HGpkg_H */