[svn-r2691]

Purpose:
    1. fix multiple defination warnings at sgi platform
    2. adding chunking information from hdf4 to hdf5 property list.
Description:
    1. Orginally global varibles were defined at one header file and this
       header file were included by other .c file and .h file so multiple warnings are
       generated.
    2. Chunking information was not included in the previous version.
Solution:
    1. use "extern" to define global variables at h4toh5util.h file and define global variables
       at h4toh5main.c
    2. retrieve the chunking info from sdgetchunkinfo and GRgetchunkinfo and store these information
	into hdf5 property list.
Platforms tested:
      eirene,arabica,paz,gondolin

1 files changed, 14 insertions, 14 deletions

diff --git a/tools/h4toh5util.h b/tools/h4toh5util.h
index 0cba454..503e02c 100644
--- a/tools/h4toh5util.h
+++ b/tools/h4toh5util.h
@@ -98,13 +98,13 @@ converter.*/
 /*considering the string size of HDF4_DIMGROUP. we add this into 276.*/
 #define MAX_DIM_NAME   276
 
-int32 estnum_vg;
-int32 estnum_vd;
-int32 num_sds;
-int32 num_images;
-int   num_objects;
-int32 num_glsdsattrs;
-int32 num_glgrattrs;
+extern int32 estnum_vg;
+extern int32 estnum_vd;
+extern int32 num_sds;
+extern int32 num_images;
+extern int   num_objects;
+extern int32 num_glsdsattrs;
+extern int32 num_glgrattrs;
 
 /**********************************************/
 /*************** section II *******************/
@@ -129,13 +129,13 @@ struct name_table {
   struct name_table *next;
 };
 
-struct table* sds_hashtab;
-struct table* gr_hashtab;
-struct table* vg_hashtab;
-struct table* vd_hashtab;
-struct table* pal_hashtab;
-struct name_table* name_hashtab;
-struct name_table* dim_hashtab;
+extern struct table* sds_hashtab;
+extern struct table* gr_hashtab;
+extern struct table* vg_hashtab;
+extern struct table* vd_hashtab;
+extern struct table* pal_hashtab;
+extern struct name_table* name_hashtab;
+extern struct name_table* dim_hashtab;
 
 /* routine for zeroing out the memory. */
 void h4toh5_ZeroMemory(void*s,size_t n);