From 310f9199970a4f20a1afed2afacacc3fe2a0027d Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Wed, 17 Nov 2004 10:25:53 -0500 Subject: [svn-r9536] Purpose: Bug fix Description: Change H5G_obj_t -> int when 1.4 compatibility is turned out Platforms tested: FreeBSD 4.10 (sleipnir) w/1.4 compat Too minor to require h5committest --- tools/lib/h5diff_array.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index 6008278..1265864 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -18,7 +18,11 @@ /* local functions */ +#ifdef H5_WANT_H5_V1_4_COMPAT +static void close_obj(int obj_type, hid_t obj_id); +#else /* H5_WANT_H5_V1_4_COMPAT */ static void close_obj(H5G_obj_t obj_type, hid_t obj_id); +#endif /* H5_WANT_H5_V1_4_COMPAT */ static int diff_region(hid_t region1_id, hid_t region2_id); static hbool_t is_zero(const void *_mem, size_t size); @@ -254,8 +258,13 @@ hsize_t diff_datum(void *_mem1, size_t size; int iszero1; int iszero2; +#ifdef H5_WANT_H5_V1_4_COMPAT + int obj1_type; + int obj2_type; +#else /* H5_WANT_H5_V1_4_COMPAT */ H5G_obj_t obj1_type; H5G_obj_t obj2_type; +#endif /* H5_WANT_H5_V1_4_COMPAT */ hid_t obj1_id; hid_t obj2_id; H5G_stat_t sb1; @@ -1714,8 +1723,13 @@ is_zero(const void *_mem, size_t size) *------------------------------------------------------------------------- */ +#ifdef H5_WANT_H5_V1_4_COMPAT +static +void close_obj(int obj_type, hid_t obj_id) +#else /* H5_WANT_H5_V1_4_COMPAT */ static void close_obj(H5G_obj_t obj_type, hid_t obj_id) +#endif /* H5_WANT_H5_V1_4_COMPAT */ { switch (obj_type) { -- cgit v0.12