[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/H5Oefl.c b/src/H5Oefl.c
index f26e276..26cb732 100644
--- a/src/H5Oefl.c
+++ b/src/H5Oefl.c
@@ -23,7 +23,7 @@ static void *H5O_efl_copy(const void *_mesg, void *_dest);
 static size_t H5O_efl_size(H5F_t *f, const void *_mesg);
 static herr_t H5O_efl_reset(void *_mesg);
 static herr_t H5O_efl_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_EFL[1] = {{
@@ -44,7 +44,7 @@ const H5O_class_t H5O_EFL[1] = {{
 #define H5O_EFL_VERSION		1
 
 /* Interface initialization */
-static intn interface_initialize_g = 0;
+static int interface_initialize_g = 0;
 #define INTERFACE_INIT	NULL
 
 
@@ -71,7 +71,7 @@ static void *
 H5O_efl_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh)
 {
     H5O_efl_t		*mesg = NULL;
-    intn		i, version;
+    int		i, version;
     const char		*s = NULL;
 
     FUNC_ENTER(H5O_efl_decode, NULL);
@@ -572,11 +572,11 @@ H5O_efl_write (H5F_t UNUSED *f, const H5O_efl_t *efl, haddr_t addr,
  */
 static herr_t
 H5O_efl_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream,
-	      intn indent, intn fwidth)
+	      int indent, int fwidth)
 {
     const H5O_efl_t	   *mesg = (const H5O_efl_t *) _mesg;
     char		    buf[64];
-    intn		    i;
+    int		    i;
 
     FUNC_ENTER(H5O_efl_debug, FAIL);