[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)

1 files changed, 10 insertions, 10 deletions

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++)
       {