[svn-r4355] 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).

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

Platforms tested:
    FreeBSD 4.4 (hawkwind)

12 files changed, 90 insertions, 90 deletions

diff --git a/test/bittests.c b/test/bittests.c
index 3469e2d..a5af191 100644
--- a/test/bittests.c
+++ b/test/bittests.c
@@ -37,7 +37,7 @@ static herr_t
 test_find (void)
 {
     uint8_t	v1[8];
-    intn	i;
+    int	i;
     ssize_t	n;
     
     TESTING("bit search operations");
@@ -157,7 +157,7 @@ test_copy (void)
 {
     uint8_t	v1[8], v2[8];
     size_t	s_offset, d_offset, size;
-    intn	i, j;
+    int	i, j;
     ssize_t	n;
     
     TESTING("bit copy operations");
@@ -172,13 +172,13 @@ test_copy (void)
 	
 	/* Copy some bits to v2 and make sure something was copied */
 	H5T_bit_copy (v2, d_offset, v1, s_offset, size);
-	for (j=0; j<(intn)sizeof(v2); j++) if (v2[j]) break;
-	if (size>0 && j>=(intn)sizeof(v2)) {
+	for (j=0; j<(int)sizeof(v2); j++) if (v2[j]) break;
+	if (size>0 && j>=(int)sizeof(v2)) {
 	    H5_FAILED();
 	    puts ("    Unabled to find copied region in destination");
 	    goto failed;
 	}
-	if (0==size && j<(intn)sizeof(v2)) {
+	if (0==size && j<(int)sizeof(v2)) {
 	    H5_FAILED();
 	    puts ("    Found copied bits when we shouldn't have");
 	    goto failed;
@@ -279,7 +279,7 @@ test_set (void)
 {
     uint8_t	v2[8];
     size_t	d_offset, size;
-    intn	i, j;
+    int	i, j;
     ssize_t	n;
     
     TESTING("bit set operations");
@@ -292,13 +292,13 @@ test_set (void)
 	
 	/* Set some bits in v2 */
 	H5T_bit_set (v2, d_offset, size, TRUE);
-	for (j=0; j<(intn)sizeof(v2); j++) if (v2[j]) break;
-	if (size>0 && j>=(intn)sizeof(v2)) {
+	for (j=0; j<(int)sizeof(v2); j++) if (v2[j]) break;
+	if (size>0 && j>=(int)sizeof(v2)) {
 	    H5_FAILED();
 	    puts ("    Unabled to find set region in buffer");
 	    goto failed;
 	}
-	if (0==size && j<(intn)sizeof(v2)) {
+	if (0==size && j<(int)sizeof(v2)) {
 	    H5_FAILED();
 	    puts ("    Found set bits when we shouldn't have");
 	    goto failed;
@@ -396,7 +396,7 @@ test_clear (void)
 {
     uint8_t	v2[8];
     size_t	d_offset, size;
-    intn	i, j;
+    int	i, j;
     ssize_t	n;
     
     TESTING("bit clear operations");
@@ -409,13 +409,13 @@ test_clear (void)
 	
 	/* Clear some bits in v2 */
 	H5T_bit_set (v2, d_offset, size, FALSE);
-	for (j=0; j<(intn)sizeof(v2); j++) if (0xff!=v2[j]) break;
-	if (size>0 && j>=(intn)sizeof(v2)) {
+	for (j=0; j<(int)sizeof(v2); j++) if (0xff!=v2[j]) break;
+	if (size>0 && j>=(int)sizeof(v2)) {
 	    H5_FAILED();
 	    puts ("    Unabled to find cleared region in buffer");
 	    goto failed;
 	}
-	if (0==size && j<(intn)sizeof(v2)) {
+	if (0==size && j<(int)sizeof(v2)) {
 	    H5_FAILED();
 	    puts ("    Found cleared bits when we shouldn't have");
 	    goto failed;
@@ -511,7 +511,7 @@ test_clear (void)
 int
 main (void)
 {
-    intn	nerrors=0;
+    int	nerrors=0;
 
     nerrors += test_find ()<0?1:0;
     nerrors += test_set  ()<0?1:0;
diff --git a/test/hyperslab.c b/test/hyperslab.c
index e328977..ea11436 100644
--- a/test/hyperslab.c
+++ b/test/hyperslab.c
@@ -42,12 +42,12 @@
  *
  *-------------------------------------------------------------------------
  */
-static uintn
+static unsigned
 init_full(uint8_t *array, size_t nx, size_t ny, size_t nz)
 {
     size_t		    i, j, k;
     uint8_t		    acc = 128;
-    uintn		    total = 0;
+    unsigned		    total = 0;
 
     for (i=0; i<nx; i++) {
 	for (j=0; j<ny; j++) {
@@ -152,13 +152,13 @@ test_fill(size_t nx, size_t ny, size_t nz,
     hsize_t	hs_size[3];	    	/*hyperslab size		*/
     hsize_t	dst_size[3];	    	/*destination total size	*/
     hssize_t	dst_offset[3];	    	/*offset of hyperslab in dest   */
-    uintn	ref_value;  		/*reference value		*/
-    uintn	acc;	    		/*accumulator		    	*/
+    unsigned	ref_value;  		/*reference value		*/
+    unsigned	acc;	    		/*accumulator		    	*/
     size_t	i, j, k, dx, dy, dz;	/*counters		   	*/
     size_t	u, v, w;
-    uintn		ndims;			/*hyperslab dimensionality	*/
+    unsigned		ndims;			/*hyperslab dimensionality	*/
     char	dim[64], s[256];    	/*temp string		    	*/
-    uintn	fill_value;	    	/*fill value		    	*/
+    unsigned	fill_value;	    	/*fill value		    	*/
 
     /*
      * Dimensionality.
@@ -326,11 +326,11 @@ test_copy(int mode,
     hsize_t	src_size[3];		/*source total size		*/
     hssize_t	dst_offset[3];		/*offset of hyperslab in dest	*/
     hssize_t	src_offset[3];		/*offset of hyperslab in source */
-    uintn	ref_value;		/*reference value		*/
-    uintn	acc;			/*accumulator			*/
+    unsigned	ref_value;		/*reference value		*/
+    unsigned	acc;			/*accumulator			*/
     hsize_t	i, j, k, dx, dy, dz;	/*counters		     	*/
     hsize_t	u, v, w;
-    uintn		ndims;			/*hyperslab dimensionality	*/
+    unsigned		ndims;			/*hyperslab dimensionality	*/
     char	dim[64], s[256];	/*temp string			*/
     const char	*sub;
 
@@ -815,8 +815,8 @@ test_endian(size_t nx)
 static herr_t
 test_transpose(size_t nx, size_t ny)
 {
-    intn	*src = NULL;
-    intn	*dst = NULL;
+    int	*src = NULL;
+    int	*dst = NULL;
     hsize_t	i, j;
     hssize_t	src_stride[2], dst_stride[2];
     hsize_t	size[2];
@@ -831,7 +831,7 @@ test_transpose(size_t nx, size_t ny)
     src = H5MM_malloc(nx * ny * sizeof(*src));
     for (i = 0; i < nx; i++) {
 	for (j = 0; j < ny; j++) {
-	    src[i * ny + j] = (intn)(i * ny + j);
+	    src[i * ny + j] = (int)(i * ny + j);
 	}
     }
     dst = H5MM_calloc(nx*ny*sizeof(*dst));
@@ -1087,13 +1087,13 @@ main(int argc, char *argv[])
 {
     herr_t		    status;
     int			    nerrors = 0;
-    uintn		    size_of_test;
+    unsigned		    size_of_test;
 
     /* Parse arguments or assume `small' */
     if (1 == argc) {
 	size_of_test = TEST_SMALL;
     } else {
-	intn			i;
+	int			i;
 	for (i = 1, size_of_test = 0; i < argc; i++) {
 	    if (!strcmp(argv[i], "small")) {
 		size_of_test |= TEST_SMALL;
diff --git a/test/istore.c b/test/istore.c
index 4fddbe3..800d27d 100644
--- a/test/istore.c
+++ b/test/istore.c
@@ -92,10 +92,10 @@ print_array(uint8_t *array, size_t nx, size_t ny, size_t nz)
  *-------------------------------------------------------------------------
  */
 static int
-new_object(H5F_t *f, const char *name, uintn ndims, H5G_entry_t *ent/*out*/)
+new_object(H5F_t *f, const char *name, unsigned ndims, H5G_entry_t *ent/*out*/)
 {
     H5O_layout_t	    layout;
-    uintn		    u;
+    unsigned		    u;
 
     /* Create the object header */
     if (H5O_create(f, 64, ent)) {
@@ -158,7 +158,7 @@ static herr_t
 test_create(H5F_t *f, const char *prefix)
 {
     H5G_entry_t		    handle;
-    uintn		    u;
+    unsigned		    u;
     char		    name[256];
 
     TESTING("istore create");
@@ -198,7 +198,7 @@ test_extend(H5F_t *f, const char *prefix,
 {
     H5G_entry_t		handle;
     hsize_t		i, j, k, ctr;
-    uintn			ndims;
+    unsigned			ndims;
     uint8_t		*buf = NULL, *check = NULL, *whole = NULL;
     char		dims[64], s[256], name[256];
     hssize_t		offset[3];
@@ -402,7 +402,7 @@ static herr_t
 test_sparse(H5F_t *f, const char *prefix, size_t nblocks,
 	    size_t nx, size_t ny, size_t nz)
 {
-    uintn		ndims;
+    unsigned		ndims;
     hsize_t		ctr;
     char		dims[64], s[256], name[256];
     hssize_t		offset[3];
@@ -510,14 +510,14 @@ main(int argc, char *argv[])
     H5F_t		*f;
     herr_t		status;
     int			nerrors = 0;
-    uintn		size_of_test;
+    unsigned		size_of_test;
     char		filename[1024];
 
     /* Parse arguments or assume `small' */
     if (1 == argc) {
 	size_of_test = TEST_SMALL;
     } else {
-	intn			i;
+	int			i;
 	for (i = 1, size_of_test = 0; i < argc; i++) {
 	    if (!strcmp(argv[i], "small")) {
 		size_of_test |= TEST_SMALL;
diff --git a/test/tarray.c b/test/tarray.c
index 306b706..fe816d5 100644
--- a/test/tarray.c
+++ b/test/tarray.c
@@ -72,7 +72,7 @@ test_array_atomic_1d(void)
     hsize_t		tdims1[] = {ARRAY1_DIM1};
     int         ndims;      /* Array rank for reading */
     hsize_t		rdims1[H5S_MAX_RANK];    /* Array dimensions for reading */
-    intn        i,j;        /* counting variables */
+    int        i,j;        /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Output message about test being performed */
@@ -196,7 +196,7 @@ test_array_atomic_3d(void)
     hsize_t		tdims2[] = {ARRAY2_DIM1,ARRAY2_DIM2,ARRAY2_DIM3};
     int         ndims;      /* Array rank for reading */
     hsize_t		rdims2[H5S_MAX_RANK];    /* Array dimensions for reading */
-    intn        i,j,k,l;    /* counting variables */
+    int        i,j,k,l;    /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Output message about test being performed */
@@ -330,7 +330,7 @@ test_array_array_atomic(void)
     int         ndims2;     /* Array rank for reading */
     hsize_t		rdims1[H5S_MAX_RANK];    /* Array dimensions for reading */
     hsize_t		rdims2[H5S_MAX_RANK];    /* Array dimensions for reading */
-    intn        i,j,k,l;    /* counting variables */
+    int        i,j,k,l;    /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Output message about test being performed */
@@ -497,7 +497,7 @@ test_array_compound_atomic(void)
     char       *mname;      /* Name of compound field */
     size_t      off;        /* Offset of compound field */
     hid_t       mtid;       /* Datatype ID for field */
-    intn        i,j;        /* counting variables */
+    int        i,j;        /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Output message about test being performed */
@@ -713,7 +713,7 @@ test_array_compound_array(void)
     size_t      off;        /* Offset of compound field */
     hid_t       mtid;       /* Datatype ID for field */
     H5T_class_t mclass;     /* Datatype class for field */
-    intn        i,j,k;      /* counting variables */
+    int        i,j,k;      /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Output message about test being performed */
@@ -1023,7 +1023,7 @@ test_array_vlen_atomic(void)
     hid_t       xfer_pid;   /* Dataset transfer property list ID */
     hsize_t     size;       /* Number of bytes which will be used */
     int         mem_used=0; /* Memory used during allocation */
-    intn        i,j,k;      /* counting variables */
+    int        i,j,k;      /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Output message about test being performed */
@@ -1239,7 +1239,7 @@ test_array_vlen_array(void)
     hid_t       xfer_pid;   /* Dataset transfer property list ID */
     hsize_t     size;       /* Number of bytes which will be used */
     int         mem_used=0; /* Memory used during allocation */
-    intn        i,j,k,l;    /* Index variables */
+    int        i,j,k,l;    /* Index variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Output message about test being performed */
@@ -1796,7 +1796,7 @@ test_compat(void)
     char       *mname;      /* Name of compound field */
     size_t      off;        /* Offset of compound field */
     hid_t       mtid;       /* Datatype ID for field */
-    intn        i;          /* Index variables */
+    int        i;          /* Index variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Output message about test being performed */
diff --git a/test/testhdf5.c b/test/testhdf5.c
index 8c1d4e7..b7cd79f 100644
--- a/test/testhdf5.c
+++ b/test/testhdf5.c
@@ -85,7 +85,7 @@ InitTest(const char *TheName, void (*TheCall) (void), void (*Cleanup) (void), co
 static void 
 usage(void)
 {
-    intn                    i;
+    int                    i;
 
     print_func("Usage: testhdf5 [-v[erbose] (l[ow]|m[edium]|h[igh]|0-10)] \n");
     print_func("               [-[e]x[clude] name+] \n");
@@ -138,7 +138,7 @@ main(int argc, char *argv[])
     int                     Summary = 0;
     int                     CleanUp = 1;
     int                     Cache = 1;
-    uintn                   major, minor, release;
+    unsigned                   major, minor, release;
 
 
 
diff --git a/test/tmeta.c b/test/tmeta.c
index 7f64aa0..5d94a9f 100644
--- a/test/tmeta.c
+++ b/test/tmeta.c
@@ -76,7 +76,7 @@ test_metadata(void)
 
     /* Check if we got what we asked for */
     if (HDmemcmp(encode_buffer, compar_buffer, sizeof(compar_buffer)) != 0) {
-        uintn                   u;      /* local counting variable */
+        unsigned                   u;      /* local counting variable */
 
         for (u = 0; u < sizeof(compar_buffer); u++) {
             if (compar_buffer[u] != encode_buffer[u]) {
diff --git a/test/trefer.c b/test/trefer.c
index f48f4f8..340ef0c 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -69,8 +69,8 @@ test_reference_obj(void)
     hobj_ref_t      *wbuf,      /* buffer to write to disk */
                *rbuf,       /* buffer read from disk */
                *tbuf;       /* temp. buffer read from disk */
-    uintn      *tu32;      /* Temporary pointer to uint32 data */
-    intn        i;          /* counting variables */
+    unsigned      *tu32;      /* Temporary pointer to uint32 data */
+    int        i;          /* counting variables */
     const char *write_comment="Foo!"; /* Comments for group */
     char read_comment[10];
     herr_t		ret;		/* Generic return value		*/
@@ -79,9 +79,9 @@ test_reference_obj(void)
     MESSAGE(5, ("Testing Object Reference Functions\n"));
 
     /* Allocate write & read buffers */
-    wbuf=malloc(MAX(sizeof(uintn),sizeof(hobj_ref_t))*SPACE1_DIM1);
-    rbuf=malloc(MAX(sizeof(uintn),sizeof(hobj_ref_t))*SPACE1_DIM1);
-    tbuf=malloc(MAX(sizeof(uintn),sizeof(hobj_ref_t))*SPACE1_DIM1);
+    wbuf=malloc(MAX(sizeof(unsigned),sizeof(hobj_ref_t))*SPACE1_DIM1);
+    rbuf=malloc(MAX(sizeof(unsigned),sizeof(hobj_ref_t))*SPACE1_DIM1);
+    tbuf=malloc(MAX(sizeof(unsigned),sizeof(hobj_ref_t))*SPACE1_DIM1);
 
     /* Create file */
     fid1 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -103,7 +103,7 @@ test_reference_obj(void)
     dataset=H5Dcreate(group,"Dataset1",H5T_NATIVE_UINT,sid1,H5P_DEFAULT);
     CHECK(dataset, FAIL, "H5Dcreate");
 
-    for(tu32=(uintn *)wbuf,i=0; i<SPACE1_DIM1; i++)
+    for(tu32=(unsigned *)wbuf,i=0; i<SPACE1_DIM1; i++)
         *tu32++=i*3;
 
     /* Write selection to disk */
@@ -219,7 +219,7 @@ test_reference_obj(void)
     ret=H5Dread(dset2,H5T_NATIVE_UINT,H5S_ALL,H5S_ALL,H5P_DEFAULT,tbuf);
     CHECK(ret, FAIL, "H5Dread");
 
-    for(tu32=(uintn *)tbuf,i=0; i<SPACE1_DIM1; i++,tu32++)
+    for(tu32=(unsigned *)tbuf,i=0; i<SPACE1_DIM1; i++,tu32++)
         VERIFY(*tu32, (uint32_t)(i*3), "Data");
 
     /* Close dereferenced Dataset */
@@ -306,7 +306,7 @@ test_reference_region(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 */
     herr_t		ret;		/* Generic return value		*/
 
     /* Output message about test being performed */
diff --git a/test/tselect.c b/test/tselect.c
index a2cd91e..22743da 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -142,7 +142,7 @@ test_select_hyper(hid_t xfer_plist)
     uint8_t    *wbuf,       /* buffer to write to disk */
                *rbuf,       /* buffer read from disk */
                *tbuf;       /* temporary buffer pointer */
-    intn        i,j;        /* Counters */
+    int        i,j;        /* Counters */
     herr_t		ret;		/* Generic return value		*/
     H5S_class_t ext_type;   /* Extent type */
 
@@ -246,7 +246,7 @@ test_select_hyper(hid_t xfer_plist)
 struct pnt_iter {
     hssize_t	coord[POINT1_NPOINTS*2][SPACE2_RANK]; /* Coordinates for point selection */
     uint8_t *buf;           /* Buffer the points are in */
-    intn offset;            /* Which point we are looking at */
+    int offset;            /* Which point we are looking at */
 };
 
 /****************************************************************
@@ -296,7 +296,7 @@ test_select_point(hid_t xfer_plist)
     uint8_t    *wbuf,       /* buffer to write to disk */
                *rbuf,       /* buffer read from disk */
                *tbuf;       /* temporary buffer pointer */
-    intn        i,j;        /* Counters */
+    int        i,j;        /* Counters */
     struct pnt_iter pi;     /* Custom Pointer iterator struct */
     herr_t		ret;		/* Generic return value		*/
 
@@ -572,7 +572,7 @@ test_select_all(hid_t xfer_plist)
     uint8_t    *wbuf,       /* buffer to write to disk */
                *rbuf,       /* buffer read from disk */
                *tbuf;       /* temporary buffer pointer */
-    intn        i,j,k;      /* Counters */
+    int        i,j,k;      /* Counters */
     herr_t		ret;		/* Generic return value		*/
     H5S_class_t ext_type;   /* Extent type */
 
@@ -656,7 +656,7 @@ test_select_all_hyper(hid_t xfer_plist)
     uint8_t    *wbuf,       /* buffer to write to disk */
                *rbuf,       /* buffer read from disk */
                *tbuf;       /* temporary buffer pointer */
-    intn        i,j;        /* Counters */
+    int        i,j;        /* Counters */
     herr_t		ret;		/* Generic return value		*/
     H5S_class_t ext_type;   /* Extent type */
 
@@ -796,7 +796,7 @@ test_select_combo(void)
                *rbuf,       /* buffer read from disk */
                *tbuf,       /* temporary buffer pointer */
                *tbuf2;      /* temporary buffer pointer */
-    intn        i,j;        /* Counters */
+    int        i,j;        /* Counters */
     herr_t		ret;		/* Generic return value		*/
 
     /* Output message about test being performed */
@@ -962,7 +962,7 @@ test_select_hyper_stride(void)
       216,217,218,242,243,244,    /* Block #11 */
       220,221,222,246,247,248,    /* Block #12 */
             };
-    intn        i,j;        /* Counters */
+    int        i,j;        /* Counters */
     herr_t		ret;		/* Generic return value		*/
 
     /* Output message about test being performed */
@@ -1090,7 +1090,7 @@ test_select_hyper_contig(void)
     uint16_t   *wbuf,       /* buffer to write to disk */
                *rbuf,       /* buffer read from disk */
                *tbuf;       /* temporary buffer pointer */
-    intn        i,j;        /* Counters */
+    int        i,j;        /* Counters */
     herr_t		ret;		/* Generic return value		*/
 
     /* Output message about test being performed */
@@ -1223,7 +1223,7 @@ test_select_hyper_copy(void)
                *rbuf,       /* 1st buffer read from disk */
                *rbuf2,      /* 2nd buffer read from disk */
                *tbuf;       /* temporary buffer pointer */
-    intn        i,j;        /* Counters */
+    int        i,j;        /* Counters */
     herr_t		ret;		/* Generic return value		*/
 
     /* Output message about test being performed */
@@ -1381,7 +1381,7 @@ test_select_point_copy(void)
                *rbuf,       /* 1st buffer read from disk */
                *rbuf2,      /* 2nd buffer read from disk */
                *tbuf;       /* temporary buffer pointer */
-    intn        i,j;        /* Counters */
+    int        i,j;        /* Counters */
     herr_t		ret;		/* Generic return value		*/
 
     /* Output message about test being performed */
@@ -1554,7 +1554,7 @@ test_select_hyper_offset(void)
                *rbuf,       /* buffer read from disk */
                *tbuf,       /* temporary buffer pointer */
                *tbuf2;      /* temporary buffer pointer */
-    intn        i,j;        /* Counters */
+    int        i,j;        /* Counters */
     herr_t		ret;		/* Generic return value		*/
     htri_t	    valid;		/* Generic boolean return value		*/
     H5S_class_t ext_type;   /* Extent type */
@@ -1715,7 +1715,7 @@ test_select_point_offset(void)
                *rbuf,       /* buffer read from disk */
                *tbuf,       /* temporary buffer pointer */
                *tbuf2;      /* temporary buffer pointer */
-    intn        i,j;        /* Counters */
+    int        i,j;        /* Counters */
     herr_t		ret;		/* Generic return value		*/
     htri_t	    valid;		/* Generic boolean return value		*/
 
@@ -1894,7 +1894,7 @@ test_select_hyper_union(void)
                *rbuf,       /* buffer read from disk */
                *tbuf,       /* temporary buffer pointer */
                *tbuf2;      /* temporary buffer pointer */
-    intn        i,j;        /* Counters */
+    int        i,j;        /* Counters */
     herr_t		ret;		/* Generic return value		*/
     hsize_t	    npoints;	/* Number of elements in selection */
 
@@ -2355,7 +2355,7 @@ test_select_hyper_union(void)
     /* Compare data read with data written out */
     for(i=0,tbuf2=rbuf; i<SPACE2_DIM1; i++) {
         tbuf=wbuf+(i*SPACE2_DIM2)+begin[i];
-        for(j=0; j<(intn)len[i]; j++, tbuf++, tbuf2++) {
+        for(j=0; j<(int)len[i]; j++, tbuf++, tbuf2++) {
             if(*tbuf!=*tbuf2) {
                 printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n",__LINE__,i,j,(int)*tbuf,(int)*tbuf2);
                 num_errs++;
@@ -2597,7 +2597,7 @@ test_select_hyper_union_3d(void)
                *rbuf,       /* buffer read from disk */
                *tbuf,       /* temporary buffer pointer */
                *tbuf2;      /* temporary buffer pointer */
-    intn        i,j,k;      /* Counters */
+    int        i,j,k;      /* Counters */
     herr_t		ret;		/* Generic return value		*/
     hsize_t	    npoints;	/* Number of elements in selection */
 
@@ -2682,9 +2682,9 @@ test_select_hyper_union_3d(void)
     CHECK(ret, FAIL, "H5Dread");
 
     /* Compare data read with data written out */
-    for(i=0,tbuf2=rbuf; i<(intn)(sizeof(rows)/sizeof(struct row_list)); i++) {
+    for(i=0,tbuf2=rbuf; i<(int)(sizeof(rows)/sizeof(struct row_list)); i++) {
         tbuf=wbuf+(rows[i].z*SPACE4_DIM3*SPACE4_DIM2)+(rows[i].y*SPACE4_DIM3)+rows[i].x;
-        for(j=0; j<(intn)rows[i].l; j++, tbuf++, tbuf2++) {
+        for(j=0; j<(int)rows[i].l; j++, tbuf++, tbuf2++) {
             if(*tbuf!=*tbuf2) {
                 printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n",__LINE__,i,j,(int)*tbuf,(int)*tbuf2);
                 num_errs++;
@@ -2763,7 +2763,7 @@ test_select_hyper_union_random_5d(hid_t read_plist)
     int    *wbuf,          /* buffer to write to disk */
                *rbuf,       /* buffer read from disk */
                *tbuf;       /* temporary buffer pointer */
-    intn        i,j,k,l,m;  /* Counters */
+    int        i,j,k,l,m;  /* Counters */
     herr_t		ret;		/* Generic return value		*/
     hssize_t	npoints,	/* Number of elements in file selection */
                 npoints2;	/* Number of elements in memory selection */
@@ -2854,7 +2854,7 @@ printf("random I/O, before H5Dread()\n");
 {
     hsize_t blocks[15][2][SPACE5_RANK];
     hssize_t nblocks;
-    intn k;
+    int k;
 
     nblocks=H5Sget_select_hyper_nblocks(sid1);
     printf("nblocks=%d\n",(int)nblocks);
diff --git a/test/ttbbt.c b/test/ttbbt.c
index 523341f..6861afa 100644
--- a/test/ttbbt.c
+++ b/test/ttbbt.c
@@ -42,9 +42,9 @@
 
 #define RandInt(a,b) ((rand()%(((b)-(a))+1))+(a))
 
-intn tcompare (void * k1, void * k2, intn cmparg);
+int tcompare (void * k1, void * k2, int cmparg);
 
-static void swap_arr(int *arr, intn a, intn b)
+static void swap_arr(int *arr, int a, int b)
 {
     int       t;
 
@@ -56,27 +56,27 @@ static void swap_arr(int *arr, intn a, intn b)
       }     /* end if */
 }   /* end swap_arr() */
 
-intn
-tcompare(void * k1, void * k2, intn cmparg)
+int
+tcompare(void * k1, void * k2, int cmparg)
 {
     /* shut compiler up */
     cmparg=cmparg;
-    return ((intn) ((*(int *) k1) - (*(int *) k2)));
+    return ((int) ((*(int *) k1) - (*(int *) k2)));
 }
 
 void
 test_tbbt(void)
 {
-    intn        test_size;
-    intn        i, j;
+    int        test_size;
+    int        i, j;
     int       ins_arr[MAX_TEST_SIZE];
     int       rem_arr[MAX_TEST_SIZE];
-    intn        t;
+    int        t;
     H5TB_TREE  *tree;
     void *      *r;
 
-    t = (intn)time(NULL);
-    srand((uintn)t);
+    t = (int)time(NULL);
+    srand((unsigned)t);
 
     for (test_size = 3; test_size <= MAX_TEST_SIZE; test_size++)
       {
diff --git a/test/ttsafe.c b/test/ttsafe.c
index ef02bc5..f24b398 100644
--- a/test/ttsafe.c
+++ b/test/ttsafe.c
@@ -96,7 +96,7 @@ static void InitTest(const char *TheName, void (*TheCall) (void),
 
 static void usage(void)
 {
-	intn i;
+	int i;
 
 	print_func("Usage: ttsafe [-v[erbose] (l[ow]|m[edium]|h[igh]|0-10)] \n");
 	print_func("              [-[e]x[clude] name+] \n");
@@ -179,7 +179,7 @@ int main(int argc, char *argv[])
 {
 	int CLLoop;     /* Command Line Loop */
 	int Loop, Loop1, Summary = 0, CleanUp = 1, Cache = 1;
-	uintn major, minor, release;
+	unsigned major, minor, release;
 
 #if defined __MWERKS__
 	argc = ccommand(&argv);
diff --git a/test/tvlstr.c b/test/tvlstr.c
index ccf51d3..40c3880 100644
--- a/test/tvlstr.c
+++ b/test/tvlstr.c
@@ -122,7 +122,7 @@ test_vlstrings_basic(void)
     hid_t       xfer_pid;   /* Dataset transfer property list ID */
     hsize_t		dims1[] = {SPACE1_DIM1};
     hsize_t     size;       /* Number of bytes which will be used */
-    uintn       i;          /* counting variable */
+    unsigned       i;          /* counting variable */
     int         str_used;   /* String data in memory */
     int         mem_used=0; /* Memory used during allocation */
     herr_t		ret;		/* Generic return value		*/
diff --git a/test/tvltypes.c b/test/tvltypes.c
index 00179e4..3383818 100644
--- a/test/tvltypes.c
+++ b/test/tvltypes.c
@@ -113,7 +113,7 @@ test_vltypes_vlen_atomic(void)
     hid_t       xfer_pid;   /* Dataset transfer property list ID */
     hsize_t		dims1[] = {SPACE1_DIM1};
     hsize_t     size;       /* Number of bytes which will be used */
-    uintn       i,j;        /* counting variables */
+    unsigned       i,j;        /* counting variables */
     size_t         mem_used=0; /* Memory used during allocation */
     herr_t		ret;		/* Generic return value		*/
 
@@ -241,7 +241,7 @@ test_vltypes_vlen_compound(void)
     hid_t       xfer_pid;   /* Dataset transfer property list ID */
     hsize_t		dims1[] = {SPACE1_DIM1};
     hsize_t     size;       /* Number of bytes which will be used */
-    uintn       i,j;        /* counting variables */
+    unsigned       i,j;        /* counting variables */
     size_t         mem_used=0; /* Memory used during allocation */
     herr_t		ret;		/* Generic return value		*/
 
@@ -391,7 +391,7 @@ test_vltypes_compound_vlen_atomic(void)
     hid_t       xfer_pid;   /* Dataset transfer property list ID */
     hsize_t		dims1[] = {SPACE1_DIM1};
     hsize_t     size;       /* Number of bytes which will be used */
-    uintn       i,j;        /* counting variables */
+    unsigned       i,j;        /* counting variables */
     size_t         mem_used=0; /* Memory used during allocation */
     herr_t		ret;		/* Generic return value		*/
 
@@ -564,7 +564,7 @@ test_vltypes_vlen_vlen_atomic(void)
     hid_t       xfer_pid;   /* Dataset transfer property list ID */
     hsize_t		dims1[] = {SPACE1_DIM1};
     hsize_t     size;       /* Number of bytes which will be used */
-    uintn       i,j,k;      /* counting variables */
+    unsigned       i,j,k;      /* counting variables */
     size_t         mem_used=0; /* Memory used during allocation */
     herr_t		ret;		/* Generic return value		*/