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

diff --git a/src/H5Iprivate.h b/src/H5Iprivate.h
index e0e7176..abf2a4e 100644
--- a/src/H5Iprivate.h
+++ b/src/H5Iprivate.h
@@ -50,32 +50,32 @@
 typedef herr_t (*H5I_free_t)(void*);
 
 /* Type of the function to compare objects & keys */
-typedef intn (*H5I_search_func_t)(void *obj, const void *key);
+typedef int (*H5I_search_func_t)(void *obj, const void *key);
 
 /* Atom information structure used */
 typedef struct H5I_id_info_t {
     hid_t	id;		/* ID for this info			    */
-    uintn	count;		/* ref. count for this atom		    */
+    unsigned	count;		/* ref. count for this atom		    */
     void	*obj_ptr;	/* pointer associated with the atom	    */
     struct H5I_id_info_t *next;	/* link to next atom (in case of hash-clash)*/
 } H5I_id_info_t;
 
 /* ID group structure used */
 typedef struct {
-    uintn	count;		/*# of times this group has been initialized*/
-    uintn	reserved;	/*# of IDs to reserve for constant IDs	    */
-    uintn	wrapped;	/*whether the id count has wrapped around   */
+    unsigned	count;		/*# of times this group has been initialized*/
+    unsigned	reserved;	/*# of IDs to reserve for constant IDs	    */
+    unsigned	wrapped;	/*whether the id count has wrapped around   */
     size_t	hash_size;	/*sizeof the hash table to store the IDs in */
-    uintn	ids;		/*current number of IDs held		    */
-    uintn	nextid;		/*ID to use for the next atom		    */
+    unsigned	ids;		/*current number of IDs held		    */
+    unsigned	nextid;		/*ID to use for the next atom		    */
     H5I_free_t	free_func;	/*release object method	    		    */
     H5I_id_info_t **id_list;	/*pointer to an array of ptrs to IDs	    */
 } H5I_id_group_t;
 
 /* Private Functions in H5I.c */
-__DLL__ intn H5I_init_group(H5I_type_t grp, size_t hash_size, uintn reserved,
+__DLL__ int H5I_init_group(H5I_type_t grp, size_t hash_size, unsigned reserved,
 			    H5I_free_t func);
-__DLL__ intn H5I_nmembers(H5I_type_t grp);
+__DLL__ int H5I_nmembers(H5I_type_t grp);
 __DLL__ herr_t H5I_clear_group(H5I_type_t grp, hbool_t force);
 __DLL__ herr_t H5I_destroy_group(H5I_type_t grp);
 __DLL__ hid_t H5I_register(H5I_type_t grp, void *object);
@@ -84,6 +84,6 @@ __DLL__ H5I_type_t H5I_get_type(hid_t id);
 __DLL__ void *H5I_remove(hid_t id);
 __DLL__ void *H5I_search(H5I_type_t grp, H5I_search_func_t func,
 			 const void *key);
-__DLL__ intn H5I_inc_ref(hid_t id);
-__DLL__ intn H5I_dec_ref(hid_t id);
+__DLL__ int H5I_inc_ref(hid_t id);
+__DLL__ int H5I_dec_ref(hid_t id);
 #endif