1 files changed, 12 insertions, 73 deletions

diff --git a/src/H5public.h b/src/H5public.h
index ed7933f..912d935 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -24,79 +24,17 @@
 #endif
 
 /*
- * Data types
+ * Status return values.  Failed integer functions in HDF5 result almost
+ * always in a negative value (unsigned failing functions sometimes return
+ * zero for failure) while successfull return is non-negative (often zero).
+ * The negative failure value is most commonly -1, but don't bet on it.  The
+ * proper way to detect failure is something like:
+ *
+ * 	if ((dset = H5Dopen (file, name))<0) {
+ *	   fprintf (stderr, "unable to open the requested dataset\n");
+ *	}
  */
-typedef char            char8;
-typedef signed char int8;
-typedef unsigned char   uchar8, uint8;
-
-#if SIZEOF_SHORT==2
-typedef short int16;
-typedef unsigned short uint16;
-#else
-typedef int int16;              /*not really */
-typedef unsigned uint16;        /*not really */
-#endif
-
-#if SIZEOF_INT==4
-typedef int int32;
-typedef unsigned int uint32;
-#elif SIZEOF_LONG==4
-typedef long int32;
-typedef unsigned long uint32;
-#else
-typedef int int32;              /*not really */
-typedef unsigned uint32;        /*not really */
-#endif
-
-#if SIZEOF_INT==8
-typedef int             int64;
-typedef unsigned        uint64;
-#elif SIZEOF_LONG==8
-typedef long            int64;
-typedef unsigned long   uint64;
-#elif SIZEOF_LONG_LONG==8
-typedef long long       int64;
-typedef unsigned long long uint64;
-#else
-#  error "no 64-bit integer type"
-#endif
-
-#if SIZEOF_FLOAT==4
-typedef float float32;
-#else
-typedef float float32;          /*not really */
-#endif
-
-#if SIZEOF_FLOAT==8
-typedef float float64;
-#elif SIZEOF_DOUBLE==8
-typedef double float64;
-#else
-#  error "no 64-bit floating point type"
-#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;
-
-/*
- * Status return values.
- * Since some unix/c routines use 0 and -1 (or more precisely, non-negative
- * vs. negative) as their return code, and some assumption had been made in
- * the code about that, it is important to keep these constants the same
- * values.  When checking the success or failure of an integer-valued
- * function, remember to compare against zero and not one of these two
- * values.
- */
-typedef intn herr_t;
-
-#define SUCCEED         0
-#define FAIL            (-1)
-#define UFAIL           (unsigned)(-1)
+typedef int herr_t;
 
 /*
  * Boolean type.
@@ -111,7 +49,8 @@ extern "C" {
 herr_t H5open (void);
 herr_t H5close (void);
 herr_t H5dont_atexit (void);
-herr_t H5version (uintn *majnum, uintn *minnum, uintn *relnum, uintn *patnum);
+herr_t H5version (unsigned *majnum, unsigned *minnum, unsigned *relnum,
+		  unsigned *patnum);
 
 #ifdef __cplusplus
 }