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

diff --git a/src/H5Olayout.c b/src/H5Olayout.c
index 6f918f7..5603258 100644
--- a/src/H5Olayout.c
+++ b/src/H5Olayout.c
@@ -21,7 +21,7 @@ static void *H5O_layout_copy(const void *_mesg, void *_dest);
 static size_t H5O_layout_size(H5F_t *f, const void *_mesg);
 static herr_t H5O_layout_free (void *_mesg);
 static herr_t H5O_layout_debug(H5F_t *f, const void *_mesg, FILE * stream,
-			       intn indent, intn fwidth);
+			       int indent, int fwidth);
 
 /* This message derives from H5O */
 const H5O_class_t H5O_LAYOUT[1] = {{
@@ -43,7 +43,7 @@ const H5O_class_t H5O_LAYOUT[1] = {{
 
 /* Interface initialization */
 #define PABLO_MASK      H5O_layout_mask
-static intn interface_initialize_g = 0;
+static int interface_initialize_g = 0;
 #define INTERFACE_INIT  NULL
 
 /* Declare a free list to manage the H5O_layout_t struct */
@@ -73,8 +73,8 @@ static void *
 H5O_layout_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh)
 {
     H5O_layout_t           *mesg = NULL;
-    intn                    version;
-    uintn                   u;
+    int                    version;
+    unsigned                   u;
 
     FUNC_ENTER(H5O_layout_decode, NULL);
 
@@ -142,7 +142,7 @@ static herr_t
 H5O_layout_encode(H5F_t *f, uint8_t *p, const void *_mesg)
 {
     const H5O_layout_t     *mesg = (const H5O_layout_t *) _mesg;
-    uintn                     u;
+    unsigned                     u;
 
     FUNC_ENTER(H5O_layout_encode, FAIL);
 
@@ -298,10 +298,10 @@ H5O_layout_free (void *mesg)
  */
 static herr_t
 H5O_layout_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream,
-		 intn indent, intn fwidth)
+		 int indent, int fwidth)
 {
     const H5O_layout_t     *mesg = (const H5O_layout_t *) _mesg;
-    uintn                    u;
+    unsigned                    u;
 
     FUNC_ENTER(H5O_layout_debug, FAIL);