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

diff --git a/src/H5Oshared.c b/src/H5Oshared.c
index 04be059..1b8b423 100644
--- a/src/H5Oshared.c
+++ b/src/H5Oshared.c
@@ -22,7 +22,7 @@
 static void *H5O_shared_decode (H5F_t*, const uint8_t*, H5O_shared_t *sh);
 static herr_t H5O_shared_encode (H5F_t*, uint8_t*, const void*);
 static size_t H5O_shared_size (H5F_t*, const void*);
-static herr_t H5O_shared_debug (H5F_t*, const void*, FILE*, intn, intn);
+static herr_t H5O_shared_debug (H5F_t*, const void*, FILE*, int, int);
 
 /* This message derives from H5O */
 const H5O_class_t H5O_SHARED[1] = {{
@@ -44,7 +44,7 @@ const H5O_class_t H5O_SHARED[1] = {{
 
 /* Interface initialization */
 #define PABLO_MASK	H5O_shared_mask
-static intn interface_initialize_g = 0;
+static int interface_initialize_g = 0;
 #define INTERFACE_INIT  NULL
 
 
@@ -69,7 +69,7 @@ static void *
 H5O_shared_decode (H5F_t *f, const uint8_t *buf, H5O_shared_t UNUSED *sh)
 {
     H5O_shared_t	*mesg;
-    uintn		flags, version;
+    unsigned		flags, version;
     
     FUNC_ENTER (H5O_shared_decode, NULL);
 
@@ -130,7 +130,7 @@ static herr_t
 H5O_shared_encode (H5F_t *f, uint8_t *buf/*out*/, const void *_mesg)
 {
     const H5O_shared_t	*mesg = (const H5O_shared_t *)_mesg;
-    uintn		flags;
+    unsigned		flags;
     
     FUNC_ENTER (H5O_shared_encode, FAIL);
 
@@ -209,7 +209,7 @@ H5O_shared_size (H5F_t *f, const void UNUSED *_mesg)
  */
 static herr_t
 H5O_shared_debug (H5F_t UNUSED *f, const void *_mesg,
-		  FILE *stream, intn indent, intn fwidth)
+		  FILE *stream, int indent, int fwidth)
 {
     const H5O_shared_t	*mesg = (const H5O_shared_t *)_mesg;