[svn-r8414] Purpose:

bug fix

Description:
added compability for the 1.4 version

Solution:

Platforms tested:
free BSD
linux

Misc. update:

6 files changed, 26 insertions, 19 deletions

diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 9ac321b..a84a9b5 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -369,7 +369,7 @@ int diff( hid_t      file1_id,
           hid_t      file2_id, 
           const char *path2, 
           diff_opt_t *options, 
-          H5G_obj_t  type )
+          H5G_obj_t1  type )
 {
  hid_t       type1_id=-1;
  hid_t       type2_id=-1;
diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h
index 0c52f76..09a96fd 100644
--- a/tools/lib/h5diff.h
+++ b/tools/lib/h5diff.h
@@ -108,7 +108,7 @@ int diff( hid_t      file1_id,
           hid_t      file2_id, 
           const char *path2, 
           diff_opt_t *options, 
-          H5G_obj_t  type );
+          H5G_obj_t1  type );
 
 int diff_compare( hid_t file1_id, 
                   const char *file1_name, 
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index 838cc3d..25ebf83 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -53,7 +53,7 @@ static int diff_char(unsigned char *mem1,
              int           *ph);
 
 static hbool_t is_zero(const void *_mem, size_t size);
-static void close_obj(H5G_obj_t obj_type, hid_t obj_id);
+static void close_obj(H5G_obj_t1 obj_type, hid_t obj_id);
 static int diff_region(hid_t region1_id, hid_t region2_id);
 
 
@@ -228,8 +228,8 @@ int diff_datum( void       *_mem1,
  size_t        size;
  int           iszero1;
  int           iszero2;
- H5G_obj_t     obj1_type;
- H5G_obj_t     obj2_type;
+ H5G_obj_t1    obj1_type;
+ H5G_obj_t1    obj2_type;
  hid_t         obj1_id;
  hid_t         obj2_id;
  H5G_stat_t    sb1;
@@ -1673,7 +1673,7 @@ is_zero(const void *_mem, size_t size)
  */
 
 static 
-void close_obj(H5G_obj_t obj_type, hid_t obj_id)
+void close_obj(H5G_obj_t1 obj_type, hid_t obj_id)
 {
  
  switch (obj_type) {
diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c
index 9c1db43..08c75e6 100644
--- a/tools/lib/h5trav.c
+++ b/tools/lib/h5trav.c
@@ -32,7 +32,7 @@ herr_t get_name_type( hid_t loc_id,
                       const char *group_name, 
                       int idx, 
                       char **name, 
-                      H5G_obj_t *type );
+                      H5G_obj_t1 *type );
 
 /*-------------------------------------------------------------------------
  * Function: h5trav_getinfo
@@ -277,7 +277,7 @@ herr_t get_name_type( hid_t loc_id,
                       const char *group_name, 
                       int idx, 
                       char **name, 
-                      H5G_obj_t *type ) 
+                      H5G_obj_t1 *type ) 
 {
 
  trav_info_t info;
@@ -313,7 +313,7 @@ int traverse( hid_t loc_id,
 {
  
  char          *name=NULL;
- H5G_obj_t     type;
+ H5G_obj_t1     type;
  int           n_names;
  char          *path=NULL;
  H5G_stat_t    statbuf;
diff --git a/tools/lib/h5trav.h b/tools/lib/h5trav.h
index af41a4e..4493b0b 100644
--- a/tools/lib/h5trav.h
+++ b/tools/lib/h5trav.h
@@ -27,15 +27,22 @@
  * the TYPE can be: 
  *    H5G_UNKNOWN = -1,		
  *    H5G_LINK,		        Object is a symbolic link	
- *    H5G_GROUP,		       Object is a group		
- *    H5G_DATASET,		     Object is a dataset		
- *    H5G_TYPE,			       Object is a named data type	
+ *    H5G_GROUP,		    Object is a group		
+ *    H5G_DATASET,		    Object is a dataset		
+ *    H5G_TYPE,			    Object is a named data type	
  *-------------------------------------------------------------------------
  */
 
+/* hack to alow v1.4 compability */
+#ifdef H5_WANT_H5_V1_4_COMPAT
+ typedef int H5G_obj_t1;
+#else
+ typedef H5G_obj_t H5G_obj_t1;
+#endif
+
 typedef struct trav_info_t {
-	char      *name;
-	H5G_obj_t type;
+	char       *name;
+	H5G_obj_t1 type;
 } trav_info_t;
 
 
@@ -58,7 +65,7 @@ typedef struct trav_obj_t {
     unsigned    flags[2];  /* h5diff.object is present or not in both files*/
     char        *name;     /* name */
     int         displayed; /* hard link already traversed once */
-    H5G_obj_t   type;      /* type of object */
+    H5G_obj_t1  type;      /* type of object */
     trav_link_t *links;    /* array of possible link names */
     int         sizelinks; /* size of links array */
     int         nlinks;    /* number of links */
@@ -122,12 +129,12 @@ int  trav_table_search(unsigned long *objno,
 
 void trav_table_add(unsigned long *objno, 
                     char *objname, 
-                    H5G_obj_t type, 
+                    H5G_obj_t1 type, 
                     trav_table_t *table);
 
 void trav_table_addflags(unsigned *flags, 
                          char *objname, 
-                         H5G_obj_t type, 
+                         H5G_obj_t1 type, 
                          trav_table_t *table);
 
 
diff --git a/tools/lib/h5trav_table.c b/tools/lib/h5trav_table.c
index 940fc0e..7527975 100644
--- a/tools/lib/h5trav_table.c
+++ b/tools/lib/h5trav_table.c
@@ -58,7 +58,7 @@ int trav_table_search(unsigned long *objno, trav_table_t *table )
 
 void trav_table_add(unsigned long *objno, 
                     char *name, 
-                    H5G_obj_t type, 
+                    H5G_obj_t1 type, 
                     trav_table_t *table)
 {
  int i;
@@ -108,7 +108,7 @@ void trav_table_add(unsigned long *objno,
 
 void trav_table_addflags(unsigned *flags, 
                          char *name, 
-                         H5G_obj_t type, 
+                         H5G_obj_t1 type, 
                          trav_table_t *table)
 {
  int i;