[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, 4 insertions, 4 deletions

diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c
index 6932d70..4d31903 100644
--- a/src/H5Tvlen.c
+++ b/src/H5Tvlen.c
@@ -25,7 +25,7 @@
 #define PABLO_MASK	H5Tvlen_mask
 
 /* Interface initialization */
-static intn interface_initialize_g = 0;
+static int interface_initialize_g = 0;
 #define INTERFACE_INIT NULL
 
 /* Local functions */
@@ -506,7 +506,7 @@ herr_t H5T_vlen_disk_write(hid_t plist_id, H5F_t *f, void *vl_addr, void *buf, h
 static herr_t 
 H5T_vlen_reclaim_recurse(void *elem, H5T_t *dt, H5MM_free_t free_func, void *free_info)
 {
-    intn i;     /* local index variable */
+    int i;     /* local index variable */
     size_t j;   /* local index variable */
     herr_t ret_value = SUCCEED;
 
@@ -679,8 +679,8 @@ H5T_vlen_mark(H5T_t *dt, H5F_t *f, H5T_vlen_loc_t loc)
 {
     htri_t vlen_changed;    /* Whether H5T_vlen_mark changed the type (even if the size didn't change) */
     htri_t ret_value = 0;   /* Indicate that success, but no location change */
-    intn i;                 /* Local index variable */
-    intn accum_change=0;    /* Amount of change in the offset of the fields */
+    int i;                 /* Local index variable */
+    int accum_change=0;    /* Amount of change in the offset of the fields */
     size_t old_size;        /* Previous size of a field */
 
     FUNC_ENTER(H5T_vlen_mark, FAIL);