[svn-r4360] 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).

    (Merged from the same changes to development branch)

Solution:
    Changed the uintn & intn's to unsigned and int's respectively.

Platforms tested:
    FreeBSD 4.4 (hawkwind)

1 files changed, 12 insertions, 19 deletions

diff --git a/src/H5private.h b/src/H5private.h
index 771b417..c7732e7 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -406,13 +406,6 @@ MS doesn't recognize it yet (as of April 2001)
 #endif
 
 /*
- * Define a type for generic integers.	Use this instead of `int' to
- * show that some thought went into the algorithm.
- */
-typedef int intn;
-typedef unsigned uintn;
-
-/*
  * Maximum and minimum values.	These should be defined in <limits.h> for the
  * most part.
  */
@@ -1061,7 +1054,7 @@ extern hbool_t H5_libinit_g;   /*good thing C's lazy about extern! */
  * through one of these two sets of macros.
  */
 #ifdef H5_HAVE_PABLO
-#  define PABLO_SAVE(func_id)	intn pablo_func_id = func_id;
+#  define PABLO_SAVE(func_id)	int pablo_func_id = func_id;
 #  define PABLO_TRACE_ON(m, f)	TRACE_ON(m,f)
 #  define PABLO_TRACE_OFF(m, f) TRACE_OFF(m,f)
 #else
@@ -1075,16 +1068,16 @@ __DLL__ herr_t H5_init_library(void);
 __DLL__ void H5_term_library(void);
 
 /* Functions to terminate interfaces */
-__DLL__ intn H5A_term_interface(void);
-__DLL__ intn H5D_term_interface(void);
-__DLL__ intn H5F_term_interface(void);
-__DLL__ intn H5G_term_interface(void);
-__DLL__ intn H5I_term_interface(void);
-__DLL__ intn H5P_term_interface(void);
-__DLL__ intn H5R_term_interface(void);
-__DLL__ intn H5S_term_interface(void);
-__DLL__ intn H5TN_term_interface(void);
-__DLL__ intn H5T_term_interface(void);
-__DLL__ intn H5Z_term_interface(void);
+__DLL__ int H5A_term_interface(void);
+__DLL__ int H5D_term_interface(void);
+__DLL__ int H5F_term_interface(void);
+__DLL__ int H5G_term_interface(void);
+__DLL__ int H5I_term_interface(void);
+__DLL__ int H5P_term_interface(void);
+__DLL__ int H5R_term_interface(void);
+__DLL__ int H5S_term_interface(void);
+__DLL__ int H5TN_term_interface(void);
+__DLL__ int H5T_term_interface(void);
+__DLL__ int H5Z_term_interface(void);
 
 #endif