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

diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index 8d92d5c..b3dbf44 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -71,8 +71,8 @@ typedef enum H5T_sort_t {
 
 /* A compound data type */
 typedef struct H5T_compnd_t {
-    intn		nalloc;		/*num entries allocated in MEMB array*/
-    intn		nmembs;		/*number of members defined in struct*/
+    int		nalloc;		/*num entries allocated in MEMB array*/
+    int		nmembs;		/*number of members defined in struct*/
     H5T_sort_t		sorted;		/*how are members sorted?	     */
     hbool_t     has_array;  /* Set if this type has an array datatype member */
                             /* and should be written with the new version of */
@@ -82,8 +82,8 @@ typedef struct H5T_compnd_t {
 
 /* An enumeration data type */
 typedef struct H5T_enum_t {
-    intn		nalloc;		/*num entries allocated		     */
-    intn		nmembs;		/*number of members defined in enum  */
+    int		nalloc;		/*num entries allocated		     */
+    int		nmembs;		/*number of members defined in enum  */
     H5T_sort_t		sorted;		/*how are members sorted?	     */
     uint8_t		*value;		/*array of values		     */
     char		**name;		/*array of symbol names		     */
@@ -112,9 +112,9 @@ typedef struct H5T_opaque_t {
 /* An array datatype */
 typedef struct H5T_array_t {
     size_t		nelem;		/* total number of elements in array */
-    intn		ndims;		/* member dimensionality        */
+    int		ndims;		/* member dimensionality        */
     size_t		dim[H5S_MAX_RANK];  /* size in each dimension       */
-    intn		perm[H5S_MAX_RANK]; /* index permutation            */
+    int		perm[H5S_MAX_RANK]; /* index permutation            */
 } H5T_array_t;
 
 typedef enum H5T_state_t {