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

diff --git a/src/H5A.c b/src/H5A.c
index d2ca744..6fc2d54 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -32,7 +32,7 @@
 #define PABLO_MASK	H5A_mask
 
 /* Is the interface initialized? */
-static intn		interface_initialize_g = 0;
+static int		interface_initialize_g = 0;
 #define INTERFACE_INIT	H5A_init_interface
 static herr_t		H5A_init_interface(void);
 
@@ -91,10 +91,10 @@ H5A_init_interface(void)
  EXAMPLES
  REVISION LOG
 --------------------------------------------------------------------------*/
-intn
+int
 H5A_term_interface(void)
 {
-    intn	n=0;
+    int	n=0;
     
     if (interface_initialize_g) {
 	if ((n=H5I_nmembers(H5I_ATTR))) {
@@ -223,7 +223,7 @@ H5A_create(const H5G_entry_t *ent, const char *name, const H5T_t *type,
 {
     H5A_t	*attr = NULL;
     H5A_t	found_attr;
-    intn	seq=0;
+    int	seq=0;
     hid_t	ret_value = FAIL;
 
     FUNC_ENTER(H5A_create, FAIL);
@@ -388,7 +388,7 @@ hid_t
 H5Aopen_name(hid_t loc_id, const char *name)
 {
     H5G_entry_t    	*ent = NULL;   /*Symtab entry of object to attribute*/
-    intn            	idx=0;
+    int            	idx=0;
     hid_t		ret_value = FAIL;
 
     FUNC_ENTER(H5Aopen_name, FAIL);
@@ -1158,7 +1158,7 @@ H5Aiterate(hid_t loc_id, unsigned *attr_num, H5A_operator_t op, void *op_data)
     H5G_entry_t		*ent = NULL;	/*symtab ent of object to attribute */
     H5A_t          	found_attr;
     herr_t	        ret_value = 0;
-    intn		idx;
+    int		idx;
 
     FUNC_ENTER(H5Aiterate, FAIL);
     H5TRACE4("e","i*Iuxx",loc_id,attr_num,op,op_data);
@@ -1177,7 +1177,7 @@ H5Aiterate(hid_t loc_id, unsigned *attr_num, H5A_operator_t op, void *op_data)
      * Look up the attribute for the object. Make certain the start point is
      * reasonable.
      */
-    idx = attr_num ? (intn)*attr_num : 0;
+    idx = attr_num ? (int)*attr_num : 0;
     if(idx<H5O_count(ent, H5O_ATTR)) {
         while(H5O_read(ent, H5O_ATTR, idx++, &found_attr)!=NULL) {
 	    /*
@@ -1228,7 +1228,7 @@ H5Adelete(hid_t loc_id, const char *name)
 {
     H5A_t       found_attr;
     H5G_entry_t	*ent = NULL;		/*symtab ent of object to attribute */
-    intn        idx=0, found=-1;
+    int        idx=0, found=-1;
     herr_t	ret_value = FAIL;
 
     FUNC_ENTER(H5Aopen_name, FAIL);