[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/H5.c b/src/H5.c
index bdb9fb7..3d99998 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -51,7 +51,7 @@ H5_debug_t		H5_debug_g;		/*debugging info	*/
 static void		H5_debug_mask(const char*);
 
 /* Interface initialization */
-static intn          	interface_initialize_g = 0;
+static int          	interface_initialize_g = 0;
 #define INTERFACE_INIT 	NULL
 
 /*--------------------------------------------------------------------------
@@ -159,8 +159,8 @@ H5_init_library(void)
 void
 H5_term_library(void)
 {
-    intn	pending, ntries=0, n;
-    uintn	at=0;
+    int	pending, ntries=0, n;
+    unsigned	at=0;
     char	loop[1024];
     H5E_auto_t func;
     
@@ -1332,7 +1332,7 @@ H5_trace (hbool_t returning, const char *func, const char *type, ...)
     va_list		ap;
     char		buf[64], *rest;
     const char		*argname;
-    intn		argno=0, ptr, asize_idx;
+    int		argno=0, ptr, asize_idx;
     hssize_t		asize[16];
     hssize_t		i;
     void		*vp = NULL;