[svn-r6072] Purpose:

    Code Movement
Description:
    Moved definition of the H5D_t data structure into the H5Dprivate.h
    header file. With the FPHDF5 stuff, we need access to this data
    structure.
Platforms tested:
    Eirene...change small, so no need for all three tests.

2 files changed, 10 insertions, 12 deletions

diff --git a/src/H5D.c b/src/H5D.c
index 3b236f9..fcc3013 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -50,16 +50,6 @@
 
 /* Local typedefs */
 
-/*
- * A dataset is the following struct.
- */
-struct H5D_t {
-    H5G_entry_t		ent;		/* cached object header stuff	*/
-    H5T_t		*type;		/* datatype of this dataset	*/
-    hid_t               dcpl_id;        /* dataset creation property id */
-    H5O_layout_t	layout;		/* data layout			*/
-};
-
 /* Enumerated type for allocating dataset's storage */
 typedef enum {
     H5D_ALLOC_CREATE,           /* Dataset is being created */
@@ -3711,7 +3701,7 @@ H5Dget_offset(hid_t dset_id)
     haddr_t	ret_value;      /* Return value */
     
     FUNC_ENTER_API(H5Dget_offset, HADDR_UNDEF);
-    H5TRACE1("h","i",dset_id);
+    H5TRACE1("a","i",dset_id);
 
     /* Check args */
     if (NULL==(dset=H5I_object_verify(dset_id, H5I_DATASET)))
diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h
index d4a9f91..7f2a0ce 100644
--- a/src/H5Dprivate.h
+++ b/src/H5Dprivate.h
@@ -141,7 +141,15 @@
 #define H5D_XFER_HYPER_VECTOR_SIZE_SIZE       sizeof(size_t)
 #define H5D_XFER_HYPER_VECTOR_SIZE_DEF        1024
 
-typedef struct H5D_t H5D_t;
+/*
+ * A dataset is the following struct.
+ */
+typedef struct H5D_t {
+    H5G_entry_t         ent;            /* cached object header stuff   */
+    H5T_t              *type;           /* datatype of this dataset     */
+    hid_t               dcpl_id;        /* dataset creation property id */
+    H5O_layout_t        layout;         /* data layout                  */
+} H5D_t;
   
 /* Functions defined in H5D.c */
 H5_DLL herr_t H5D_init(void);