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

diff --git a/src/H5Tbit.c b/src/H5Tbit.c
index 516b1d1..55541a1 100644
--- a/src/H5Tbit.c
+++ b/src/H5Tbit.c
@@ -18,7 +18,7 @@
 
 /* Interface initialization */
 #define PABLO_MASK	H5Tbit_mask
-static intn interface_initialize_g = 0;
+static int interface_initialize_g = 0;
 #define INTERFACE_INIT NULL
 
 
@@ -40,16 +40,16 @@ void
 H5T_bit_copy (uint8_t *dst, size_t dst_offset, const uint8_t *src,
 	      size_t src_offset, size_t size)
 {
-    intn	shift;
-    uintn	mask_lo, mask_hi;
-    intn	s_idx, d_idx;
+    int	shift;
+    unsigned	mask_lo, mask_hi;
+    int	s_idx, d_idx;
 
     /*
      * Normalize the offset to be a byte number and a bit offset within that
      * byte.
      */
-    s_idx = (intn)src_offset / 8;
-    d_idx = (intn)dst_offset / 8;
+    s_idx = (int)src_offset / 8;
+    d_idx = (int)dst_offset / 8;
     src_offset %= 8;
     dst_offset %= 8;
     
@@ -110,7 +110,7 @@ H5T_bit_copy (uint8_t *dst, size_t dst_offset, const uint8_t *src,
      * bits). SHIFT is three since the source must be shifted right three bits
      * to line up with the destination.
      */
-    shift = (intn)dst_offset;
+    shift = (int)dst_offset;
     mask_lo = (1<<(8-shift))-1;
     mask_hi = (~mask_lo) & 0xff;
     
@@ -254,10 +254,10 @@ H5T_bit_set_d (uint8_t *buf, size_t offset, size_t size, hsize_t val)
 void
 H5T_bit_set (uint8_t *buf, size_t offset, size_t size, hbool_t value)
 {
-    intn	idx;
+    int	idx;
 
     /* Normalize */
-    idx = (intn)offset / 8;
+    idx = (int)offset / 8;
     offset %= 8;
 
     /* The first partial byte */