[svn-r4360] Purpose:

    Code cleanup (sorta)

Description:
    When the first versions of the HDF5 library were designed, I remembered
    vividly the difficulties of porting code from a 32-bit platform to a 16-bit
    platform and asked that people use intn & uintn instead of int & unsigned
    int, respectively.  However, in hindsight, this was overkill and
    unnecessary since we weren't going to be porting the HDF5 library to
    16-bit architectures.

    Currently, the extra uintn & intn typedefs are causing problems for users
    who'd like to include both the HDF5 and HDF4 header files in one source
    module (like Kent's h4toh5 library).

    (Merged from the same changes to development branch)

Solution:
    Changed the uintn & intn's to unsigned and int's respectively.

Platforms tested:
    FreeBSD 4.4 (hawkwind)

5 files changed, 22 insertions, 22 deletions

diff --git a/tools/h4toh5/h4toh5sds.c b/tools/h4toh5/h4toh5sds.c
index a060896..7de526a 100644
--- a/tools/h4toh5/h4toh5sds.c
+++ b/tools/h4toh5/h4toh5sds.c
@@ -55,7 +55,7 @@ int Sds_h4_to_h5(int32 file_id,int32 sds_id,hid_t h5_group,hid_t h5_dimgroup,int
   int32*  sds_stride;
   int32   count_sdsdata;
   int32   sds_ref;
-  intn   sds_empty;
+  int   sds_empty;
   int32   istat;
   int     i;
   int32   num_sdsattrs;
diff --git a/tools/h4toh5/h4toh5test.c b/tools/h4toh5/h4toh5test.c
index f717e6e..4a985d6 100644
--- a/tools/h4toh5/h4toh5test.c
+++ b/tools/h4toh5/h4toh5test.c
@@ -798,7 +798,7 @@ int test_grtyp() {
   uint32 image_data321[Y_LENGTH][X_LENGTH];
   int16  image_data16[Y_LENGTH][X_LENGTH][3];
   int16  image_data161[Y_LENGTH][X_LENGTH];
-  intn i, j;
+  int i, j;
   int32 CUB_SIZE;
   int istat;
 
@@ -970,7 +970,7 @@ int  test_ras8() {
   int32 start[2], edges[2],dims[2];
   int8 image_data8[Y_LENGTH][X_LENGTH];
   uint8 image_datau8[Y_LENGTH][X_LENGTH];
-  intn i, j;
+  int i, j;
   int32 CUB_SIZE;
 
   CUB_SIZE = (X_LENGTH-1)*(Y_LENGTH-1);
@@ -1071,7 +1071,7 @@ int  test_ras24() {
   int32 start[2], edges[2],dims[2];
   int8 image_data24[Y_LENGTH][X_LENGTH][3];
   uint8 image_datau24[Y_LENGTH][X_LENGTH][3];
-  intn i, j;
+  int i, j;
   int32 CUB_SIZE;
 
 
@@ -1178,7 +1178,7 @@ int test_imageattr() {
 
   uint8 palette_data[NUM_COLORS * 3];
   int32 num_comp,num_entries;
-  intn i, j;
+  int i, j;
 
   /* Open the file. */
   file_id = Hopen(FILEGRPAL, DFACC_CREATE, 0);
@@ -1442,7 +1442,7 @@ int test_vgnameclash() {
   int32	  file_id, vgroupa_ref, vgroupa_id,vgroupb_ref,vgroupb_id;
   int32   vgroupc_id,vgroupc_ref;
   int32	  dim_sizes[TYP_RANK];
-  intn    i, j;
+  int    i, j;
   int32   sd_id,sds_id;
   int32   sds_ref;
   int32   array_data[X_LENGTH][Y_LENGTH];
@@ -1566,7 +1566,7 @@ int test_sdsnameclash() {
   int32	  file_id, vgroupa_ref, vgroupa_id,vgroupb_ref,vgroupb_id;
   int32	  dim_sizes[TYP_RANK];
   int32   vgroupc_ref,vgroupc_id;
-  intn    i, j,istat;
+  int    i, j,istat;
   int32   sd_id,sds_id;
   int32   sds_ref;
   int32   array_data[X_LENGTH][Y_LENGTH];
@@ -2904,7 +2904,7 @@ int test_vgall() {
   int32   vgroupd_ref, vgroupd_id,vgroupe_ref,vgroupe_id;
   int32   vdata_id,values[4]={32, 16, 32, 8};
 
-  intn    i, j,k;
+  int    i, j,k;
 
   uint8   *databuf, *pntr;
   int     bufsize, recsize;
diff --git a/tools/h5dump/h5dumptst.c b/tools/h5dump/h5dumptst.c
index 01438d7..5fd2e17 100644
--- a/tools/h5dump/h5dumptst.c
+++ b/tools/h5dump/h5dumptst.c
@@ -1444,7 +1444,7 @@ static void test_objref(void)
                *rbuf,       /* buffer read from disk */
                *tbuf;       /* temp. buffer read from disk */
     uint32_t   *tu32;      /* Temporary pointer to uint32 data */
-    intn        i;          /* counting variables */
+    int        i;          /* counting variables */
     const char *write_comment="Foo!"; /* Comments for group */
 
     /* Allocate write & read buffers */
@@ -1566,7 +1566,7 @@ static void test_datareg(void)
     uint8_t    *dwbuf,      /* Buffer for writing numeric data to disk */
                *drbuf;      /* Buffer for reading numeric data from disk */
     uint8_t    *tu8;        /* Temporary pointer to uint8 data */
-    intn        i;          /* counting variables */
+    int        i;          /* counting variables */
 
     /* Allocate write & read buffers */
     wbuf=calloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1);
@@ -1932,7 +1932,7 @@ static void test_vldatatypes2(void)
     hid_t		sid1;       /* Dataspace ID			*/
     hid_t		tid1, tid2; /* Datatype IDs         */
     hsize_t		dims1[] = {SPACE1_DIM1};
-    uintn       i,j,k;      /* counting variables */
+    unsigned       i,j,k;      /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     ret = ret;	/* so that compiler won't complain "is set but never used" */
@@ -2000,7 +2000,7 @@ static void test_vldatatypes3(void)
     hid_t		sid1;       /* Dataspace ID			*/
     hid_t		tid1, tid2; /* Datatype IDs         */
     hsize_t		dims1[] = {SPACE1_DIM1};
-    uintn       i,j;        /* counting variables */
+    unsigned       i,j;        /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     ret = ret;	/* so that compiler won't complain "is set but never used" */
@@ -2061,7 +2061,7 @@ static void test_vldatatypes4(void)
     hid_t		sid1;       /* Dataspace ID			*/
     hid_t		tid1, tid2; /* Datatype IDs         */
     hsize_t		dims1[] = {SPACE1_DIM1};
-    uintn       i,j;        /* counting variables */
+    unsigned       i,j;        /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     ret = ret;	/* so that compiler won't complain "is set but never used" */
@@ -2118,7 +2118,7 @@ static void test_array1(void)
     hid_t		tid1;       /* Datatype ID			*/
     hsize_t		sdims1[] = {SPACE1_DIM1};
     hsize_t		tdims1[] = {ARRAY1_DIM1};
-    intn        i,j;        /* counting variables */
+    int        i,j;        /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Allocate and initialize array data to write */
@@ -2157,7 +2157,7 @@ static void test_array2(void)
     hid_t		tid;        /* Datatype ID			*/
     hsize_t		sdims1[] = {SPACE1_DIM1};
     hsize_t		tdims2[] = {ARRAY2_DIM1,ARRAY2_DIM2,ARRAY2_DIM3};
-    intn        i,j,k,l;    /* counting variables */
+    int        i,j,k,l;    /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Allocate and initialize array data to write */
@@ -2200,7 +2200,7 @@ static void test_array3(void)
     hsize_t		sdims1[] = {SPACE1_DIM1};
     hsize_t		tdims1[] = {ARRAY1_DIM1};
     hsize_t		tdims2[] = {ARRAY3_DIM1,ARRAY3_DIM2};
-    intn        i,j,k,l;    /* counting variables */
+    int        i,j,k,l;    /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Allocate and initialize array data to write */
@@ -2250,7 +2250,7 @@ static void test_array4(void)
     hid_t		tid2;       /* Compound Datatype ID			*/
     hsize_t		sdims1[] = {SPACE1_DIM1};
     hsize_t		tdims1[] = {ARRAY1_DIM1};
-    intn        i,j;        /* counting variables */
+    int        i,j;        /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Initialize array data to write */
@@ -2309,7 +2309,7 @@ static void test_array5(void)
     hid_t		tid3;       /* Nested Array Datatype ID	*/
     hsize_t		sdims1[] = {SPACE1_DIM1};
     hsize_t		tdims1[] = {ARRAY1_DIM1};
-    intn        i,j,k;      /* counting variables */
+    int        i,j,k;      /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Initialize array data to write */
@@ -2370,7 +2370,7 @@ static void test_array6(void)
     hid_t		tid2;       /* VL Datatype ID       */
     hsize_t		sdims1[] = {SPACE1_DIM1};
     hsize_t		tdims1[] = {ARRAY1_DIM1};
-    intn        i,j,k;      /* counting variables */
+    int        i,j,k;      /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Initialize array data to write */
@@ -2424,7 +2424,7 @@ static void test_array7(void)
     hid_t		tid3;       /* Nested Array Datatype ID   */
     hsize_t		sdims1[] = {SPACE1_DIM1};
     hsize_t		tdims1[] = {ARRAY1_DIM1};
-    intn        i,j,k,l;    /* Index variables */
+    int        i,j,k,l;    /* Index variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Initialize array data to write */
diff --git a/tools/h5toh4/h5toh4.c b/tools/h5toh4/h5toh4.c
index 09138b0..225c9c1 100644
--- a/tools/h5toh4/h5toh4.c
+++ b/tools/h5toh4/h5toh4.c
@@ -621,7 +621,7 @@ int32 status;
 int32 h4_type;
 int32 recsize;
 int32 n_records, num_of_recs, record_pos;
-intn nmembers;
+int nmembers;
 char *buffer=NULL; /* read/write buffer*/
 char fieldname_list[4096] = "\0";
 char *fieldname=NULL;
diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c
index 8832369..8ed8e23 100644
--- a/tools/misc/h5debug.c
+++ b/tools/misc/h5debug.c
@@ -57,7 +57,7 @@ main(int argc, char *argv[])
     H5F_t       *f;
     haddr_t     addr=0, extra=0;
     uint8_t     sig[16];
-    intn        i, ndims;
+    int        i, ndims;
     herr_t      status = SUCCEED;
 
     if (argc == 1) {