[svn-r4473] Purpose:

    Code cleanup for better compatibility with C++ compilers
Description:
    C++ compilers are choking on our C code, for various reasons:
        we used our UNUSED macro incorrectly when referring to pointer types
        we used various C++ keywords as variables, etc.
        we incremented enum's with the ++ operator.
Solution:
    Changed variables, etc.to avoid C++ keywords (new, class, typename, typeid,
        template)

    Fixed usage of UNUSED macro from this:
        char UNUSED *c
    to this:
        char * UNUSED c

    Switched the enums from x++ to x=x+1
Platforms tested:
    FreeBSD 4.4 (hawkwind)

1 files changed, 2 insertions, 2 deletions

diff --git a/tools/h4toh5/h4toh5image.c b/tools/h4toh5/h4toh5image.c
index a1ab359..fd32405 100644
--- a/tools/h4toh5/h4toh5image.c
+++ b/tools/h4toh5/h4toh5image.c
@@ -64,8 +64,8 @@ int Image_h4_to_h5(int32 file_id,int32 ri_id,hid_t h5_group,hid_t h5_palgroup,in
   char*    h5cimage_name;
   void*    image_data;
   HDF_CHUNK_DEF c_def_out;
-  int32    chunk_dims[2];
-  int32    chunk_dims24[3];
+  hsize_t    chunk_dims[2];
+  hsize_t    chunk_dims24[3];
   int32    c_flags;
   int32    interlace_mode;