From bbf2cc335fef9980ef3d0538487a0deb90b7f38b Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 13 Jun 2013 15:17:08 +0000
Subject: [PATCH] bugfixes

---
 src/include/h5core/h5_openclose.h | 21 ++++---------------
 src/include/h5core/h5_types.h     | 35 ++++++++++++++++++-------------
 2 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/src/include/h5core/h5_openclose.h b/src/include/h5core/h5_openclose.h
index d6736d0..f896053 100644
--- a/src/include/h5core/h5_openclose.h
+++ b/src/include/h5core/h5_openclose.h
@@ -23,6 +23,10 @@ h5_close_file (
 	h5_file_t * const f
 	);
 
+h5_err_t
+h5_close_hdf5 (
+	void);
+
 h5_err_t
 h5_flush_step (
 	h5_file_t * const f
@@ -89,23 +93,6 @@ h5_traverse_steps (
 	h5_file_t * f			/*!< file handle		*/
 	);
 
-char *
-h5_strdupfor2c (
-	const char *s,
-	const ssize_t len
-	);
-
-char *
-h5_strc2for (
-	char * const str,
-	const ssize_t l_str
-	);
-
-h5_file_t *
-h5_filehandlefor2c (
-	const h5_int64_t *ptr
-	);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/include/h5core/h5_types.h b/src/include/h5core/h5_types.h
index 4a88309..371dc5e 100644
--- a/src/include/h5core/h5_types.h
+++ b/src/include/h5core/h5_types.h
@@ -16,19 +16,21 @@ extern "C" {
   H5_O_RDWR:   dataset may exist
 */
 
-#define H5_O_RDWR		0x001
-#define H5_O_RDONLY		0x002
-#define H5_O_WRONLY		0x004
-#define H5_O_APPEND		0x008
+#define H5_O_RDWR		0x00000001
+#define H5_O_RDONLY		0x00000002
+#define H5_O_WRONLY		0x00000004
+#define H5_O_APPEND		0x00000008
 
-#define H5_VFD_MPIPOSIX         0x010
-#define H5_VFD_INDEPENDENT      0x020
+#define H5_VFD_MPIPOSIX         0x00000010
+#define H5_VFD_MPIIO_IND        0x00000020
+#define H5_VFD_INDEPENDENT      H5_VFD_MPIIO_IND // obsolete(?)
+#define H5_VFD_CORE		0x00000040
 
-#define H5_FLUSH_FILE		0x040
-#define H5_FLUSH_STEP		0x080
-#define H5_FLUSH_DATASET	0x100
+#define H5_FLUSH_FILE		0x00001000
+#define H5_FLUSH_STEP		0x00002000
+#define H5_FLUSH_DATASET	0x00004000
 
-#define H5_FS_LUSTRE		0x200
+#define H5_FS_LUSTRE		0x00010000
 
 #define H5_ID_T			H5T_NATIVE_INT64
 #define H5_FLOAT64_T		H5T_NATIVE_DOUBLE
@@ -53,11 +55,16 @@ typedef int64_t			h5_id_t;
 typedef int16_t			h5t_lvl_idx_t;
 typedef h5_int32_t		h5t_elem_flags_t;
 typedef int64_t			h5_glb_idx_t;	// type for a global index
-//typedef int64_t		h5_loc_idx_t;	// type for a local index
-typedef int32_t			h5_loc_idx_t;	// type for a local index
+
+#if defined(USE_LARGE_INDICES)
+typedef int64_t                 h5_loc_idx_t;   // type for a local index
+typedef int64_t                 h5_loc_id_t;    // type for a local ID
+#else
+typedef int32_t                 h5_loc_idx_t;   // type for a local index
+typedef int32_t                 h5_loc_id_t;    // type for a local ID
+#endif
+
 typedef int64_t			h5_glb_id_t;	// type for a global ID
-//typedef int64_t		h5_loc_id_t;	// type for a local ID
-typedef int32_t			h5_loc_id_t;	// type for a local ID
 typedef uint64_t		h5_size_t;	/* size in number of elements */
 typedef int64_t			h5_ssize_t;	/* size in number of elements */
 typedef int64_t			h5_err_t;