[svn-r1341]

Changes since 19990611
----------------------

./doc/html/H5.format.html
	Added documentation for opaque data types (bitfield types were
	already documented but they were out of order).

./src/H5E.c
	Fixed a bug with glibc2 on linux systems where `stdout' is an
	extern and can't be used to initialize static data.

./src/H5T.c
./src/H5Tpkg.h
./src/H5Tpublic.h
./src/H5detect.c
	Removed the `_T' from the new C9x types I just added so the
	names are consistent with existing types. Besides, the fact
	that something is a datatype is obvious because it starts with
	H5T_NATIVE_.

./tools/h5ls.c
	Added the new C9x data types. H5ls prints one of these types
	only if it doesn't match one of the builtin C types.

	Prints the OID for shared data types.

	Fixed a formatting bug with symbolic links which was
	introduced a few changes ago.

	The commandline has been changed so that objects from multiple
	files can be listed with a single command. Instead of
	specifying a file name and an optional list of objects, each
	thing to print is a file name and object concatenated. H5ls
	figures out how to devide the name into a file name and object
	name even when the file name part doesn't correspond to an
	actual Unix file.

	   Old syntax: h5ls [OPTIONS] FILE [OBJECTS]
	   New syntax: h5ls [OPTIONS] FILE[/OBJECT] [FILE[/OBJECT]]...

	   Example ({X,Y} is expanded by the shell)

	   Old command: h5ls -d ../test/x.data dir1 dir2
	   New command: h5ls -d ../test/x.data/{dir1,dir2}

	The filename is printed as part of the object name when full
	names are requested (--full or --recursive). If people really
	don't like this they can undefine a constant at the top of
	h5ls.

	Errors from the hdf5 library are turned off.

	Commandline switches of the form `--width 80' are accepted in
	addition to `--width=80'. This is more symmetric with
	single-letter switches that take two forms: `-w 80' and
	`-w80'.

./src/H5D.c
	Added tracing instrumentation for H5Dvlen_reclaim().

./src/H5private.h
	Added casts to int for the isalpha() et al macros to shut up
	solaris warnings about char subscripts.

7 files changed, 191 insertions, 137 deletions

diff --git a/src/.distdep b/src/.distdep
index 02eaf65..ff75d73 100644
--- a/src/.distdep
+++ b/src/.distdep
@@ -1188,7 +1188,12 @@ H5Tconv.lo: \
    H5Dpublic.h \
    H5Rprivate.h \
    H5Rpublic.h \
-   H5Tprivate.h
+   H5Tprivate.h \
+   H5Tpublic.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h
 H5Tinit.lo: \
    H5Tinit.c \
    H5private.h \
@@ -1213,6 +1218,30 @@ H5Tinit.lo: \
    H5Tpublic.h \
    H5Gprivate.h \
    H5Gpublic.h
+H5Tvlen.lo: \
+   H5Tvlen.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5api_adpt.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Ipublic.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Dpublic.h \
+   H5MMprivate.h \
+   H5MMpublic.h \
+   H5Tpkg.h \
+   H5Rprivate.h \
+   H5Rpublic.h \
+   H5Tprivate.h \
+   H5Tpublic.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5Bprivate.h
 H5TB.lo: \
    H5TB.c \
    H5private.h \
@@ -1269,8 +1298,4 @@ H5Z.lo: \
    H5HGprivate.h \
    H5HGpublic.h \
    H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h
+   H5Tpublic.h
diff --git a/src/H5D.c b/src/H5D.c
index 1739f47..b0542a0 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -2596,6 +2596,7 @@ H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf)
     herr_t ret_value=FAIL;
 
     FUNC_ENTER(H5Dvlen_reclaim, FAIL);
+    H5TRACE4("e","iiix",type_id,space_id,plist_id,buf);
 
     /* Check args */
     if (H5I_DATATYPE!=H5I_get_type(type_id) ||
diff --git a/src/H5E.c b/src/H5E.c
index 3ed3c8c..5008631 100644
--- a/src/H5E.c
+++ b/src/H5E.c
@@ -111,7 +111,8 @@ static const H5E_minor_mesg_t H5E_minor_mesg_g[] = {
 
 /* Interface initialization? */
 static intn interface_initialize_g = 0;
-#define INTERFACE_INIT NULL
+#define INTERFACE_INIT H5E_init_interface
+static herr_t H5E_init_interface (void);
 const hbool_t H5E_clearable_g = TRUE;	/* DO NOT CHANGE */
 
 /*
@@ -128,7 +129,34 @@ H5E_t		H5E_stack_g[1];
  * probably be part of the error stack so they're local to a thread.
  */
 herr_t (*H5E_auto_g)(void*) = (herr_t(*)(void*))H5Eprint;
-void *H5E_auto_data_g = stderr;
+void *H5E_auto_data_g = NULL;
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5E_init_interface
+ *
+ * Purpose:	Initialize the H5E interface. `stderr' is an extern or
+ *		function on some systems so we can't initialize
+ *		H5E_auto_data_g statically.
+ *
+ * Return:	Success:	Non-negative
+ *
+ *		Failure:	Negative
+ *
+ * Programmer:	Robb Matzke
+ *              Friday, June 11, 1999
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5E_init_interface (void)
+{
+  FUNC_ENTER(H5E_init_interface, FAIL);
+  H5E_auto_data_g = stderr;
+  FUNC_LEAVE(SUCCEED);
+}
 
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index c3facc0..5bbbb69 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -179,33 +179,33 @@ __DLLVAR__ size_t	H5T_NATIVE_DOUBLE_ALIGN_g;
 __DLLVAR__ size_t	H5T_NATIVE_LDOUBLE_ALIGN_g;
 
 /* C9x alignment constraints */
-__DLLVAR__ size_t	H5T_NATIVE_INT8_T_ALIGN_g;
-__DLLVAR__ size_t	H5T_NATIVE_UINT8_T_ALIGN_g;
-__DLLVAR__ size_t	H5T_NATIVE_INT_LEAST8_T_ALIGN_g;
-__DLLVAR__ size_t	H5T_NATIVE_UINT_LEAST8_T_ALIGN_g;
-__DLLVAR__ size_t	H5T_NATIVE_INT_FAST8_T_ALIGN_g;
-__DLLVAR__ size_t	H5T_NATIVE_UINT_FAST8_T_ALIGN_g;
-
-__DLLVAR__ size_t	H5T_NATIVE_INT16_T_ALIGN_g;
-__DLLVAR__ size_t	H5T_NATIVE_UINT16_T_ALIGN_g;
-__DLLVAR__ size_t	H5T_NATIVE_INT_LEAST16_T_ALIGN_g;
-__DLLVAR__ size_t	H5T_NATIVE_UINT_LEAST16_T_ALIGN_g;
-__DLLVAR__ size_t	H5T_NATIVE_INT_FAST16_T_ALIGN_g;
-__DLLVAR__ size_t	H5T_NATIVE_UINT_FAST16_T_ALIGN_g;
-
-__DLLVAR__ size_t	H5T_NATIVE_INT32_T_ALIGN_g;
-__DLLVAR__ size_t	H5T_NATIVE_UINT32_T_ALIGN_g;
-__DLLVAR__ size_t	H5T_NATIVE_INT_LEAST32_T_ALIGN_g;
-__DLLVAR__ size_t	H5T_NATIVE_UINT_LEAST32_T_ALIGN_g;
-__DLLVAR__ size_t	H5T_NATIVE_INT_FAST32_T_ALIGN_g;
-__DLLVAR__ size_t	H5T_NATIVE_UINT_FAST32_T_ALIGN_g;
-
-__DLLVAR__ size_t	H5T_NATIVE_INT64_T_ALIGN_g;
-__DLLVAR__ size_t	H5T_NATIVE_UINT64_T_ALIGN_g;
-__DLLVAR__ size_t	H5T_NATIVE_INT_LEAST64_T_ALIGN_g;
-__DLLVAR__ size_t	H5T_NATIVE_UINT_LEAST64_T_ALIGN_g;
-__DLLVAR__ size_t	H5T_NATIVE_INT_FAST64_T_ALIGN_g;
-__DLLVAR__ size_t	H5T_NATIVE_UINT_FAST64_T_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_INT8_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_UINT8_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_INT_LEAST8_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_UINT_LEAST8_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_INT_FAST8_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_UINT_FAST8_ALIGN_g;
+
+__DLLVAR__ size_t	H5T_NATIVE_INT16_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_UINT16_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_INT_LEAST16_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_UINT_LEAST16_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_INT_FAST16_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_UINT_FAST16_ALIGN_g;
+
+__DLLVAR__ size_t	H5T_NATIVE_INT32_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_UINT32_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_INT_LEAST32_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_UINT_LEAST32_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_INT_FAST32_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_UINT_FAST32_ALIGN_g;
+
+__DLLVAR__ size_t	H5T_NATIVE_INT64_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_UINT64_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_INT_LEAST64_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_UINT_LEAST64_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_INT_FAST64_ALIGN_g;
+__DLLVAR__ size_t	H5T_NATIVE_UINT_FAST64_ALIGN_g;
 
 /* Conversion functions */
 __DLL__ herr_t H5T_conv_noop(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index e208351..688ed2f 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -384,57 +384,57 @@ __DLLVAR__ hid_t H5T_NATIVE_HERR_g;
 __DLLVAR__ hid_t H5T_NATIVE_HBOOL_g;
 
 /* C9x integer types */
-#define H5T_NATIVE_INT8_T		(H5open(), H5T_NATIVE_INT8_T_g)
-#define H5T_NATIVE_UINT8_T		(H5open(), H5T_NATIVE_UINT8_T_g)
-#define H5T_NATIVE_INT_LEAST8_T		(H5open(), H5T_NATIVE_INT_LEAST8_T_g)
-#define H5T_NATIVE_UINT_LEAST8_T	(H5open(), H5T_NATIVE_UINT_LEAST8_T_g)
-#define H5T_NATIVE_INT_FAST8_T 		(H5open(), H5T_NATIVE_INT_FAST8_T_g)
-#define H5T_NATIVE_UINT_FAST8_T		(H5open(), H5T_NATIVE_UINT_FAST8_T_g)
-__DLLVAR__ hid_t H5T_NATIVE_INT8_T_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT8_T_g;
-__DLLVAR__ hid_t H5T_NATIVE_INT_LEAST8_T_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT_LEAST8_T_g;
-__DLLVAR__ hid_t H5T_NATIVE_INT_FAST8_T_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT_FAST8_T_g;
-
-#define H5T_NATIVE_INT16_T		(H5open(), H5T_NATIVE_INT16_T_g)
-#define H5T_NATIVE_UINT16_T		(H5open(), H5T_NATIVE_UINT16_T_g)
-#define H5T_NATIVE_INT_LEAST16_T	(H5open(), H5T_NATIVE_INT_LEAST16_T_g)
-#define H5T_NATIVE_UINT_LEAST16_T	(H5open(), H5T_NATIVE_UINT_LEAST16_T_g)
-#define H5T_NATIVE_INT_FAST16_T		(H5open(), H5T_NATIVE_INT_FAST16_T_g)
-#define H5T_NATIVE_UINT_FAST16_T	(H5open(), H5T_NATIVE_UINT_FAST16_T_g)
-__DLLVAR__ hid_t H5T_NATIVE_INT16_T_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT16_T_g;
-__DLLVAR__ hid_t H5T_NATIVE_INT_LEAST16_T_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT_LEAST16_T_g;
-__DLLVAR__ hid_t H5T_NATIVE_INT_FAST16_T_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT_FAST16_T_g;
-
-#define H5T_NATIVE_INT32_T		(H5open(), H5T_NATIVE_INT32_T_g)
-#define H5T_NATIVE_UINT32_T		(H5open(), H5T_NATIVE_UINT32_T_g)
-#define H5T_NATIVE_INT_LEAST32_T	(H5open(), H5T_NATIVE_INT_LEAST32_T_g)
-#define H5T_NATIVE_UINT_LEAST32_T	(H5open(), H5T_NATIVE_UINT_LEAST32_T_g)
-#define H5T_NATIVE_INT_FAST32_T		(H5open(), H5T_NATIVE_INT_FAST32_T_g)
-#define H5T_NATIVE_UINT_FAST32_T	(H5open(), H5T_NATIVE_UINT_FAST32_T_g)
-__DLLVAR__ hid_t H5T_NATIVE_INT32_T_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT32_T_g;
-__DLLVAR__ hid_t H5T_NATIVE_INT_LEAST32_T_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT_LEAST32_T_g;
-__DLLVAR__ hid_t H5T_NATIVE_INT_FAST32_T_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT_FAST32_T_g;
-
-#define H5T_NATIVE_INT64_T		(H5open(), H5T_NATIVE_INT64_T_g)
-#define H5T_NATIVE_UINT64_T		(H5open(), H5T_NATIVE_UINT64_T_g)
-#define H5T_NATIVE_INT_LEAST64_T	(H5open(), H5T_NATIVE_INT_LEAST64_T_g)
-#define H5T_NATIVE_UINT_LEAST64_T 	(H5open(), H5T_NATIVE_UINT_LEAST64_T_g)
-#define H5T_NATIVE_INT_FAST64_T		(H5open(), H5T_NATIVE_INT_FAST64_T_g)
-#define H5T_NATIVE_UINT_FAST64_T	(H5open(), H5T_NATIVE_UINT_FAST64_T_g)
-__DLLVAR__ hid_t H5T_NATIVE_INT64_T_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT64_T_g;
-__DLLVAR__ hid_t H5T_NATIVE_INT_LEAST64_T_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT_LEAST64_T_g;
-__DLLVAR__ hid_t H5T_NATIVE_INT_FAST64_T_g;
-__DLLVAR__ hid_t H5T_NATIVE_UINT_FAST64_T_g;
+#define H5T_NATIVE_INT8			(H5open(), H5T_NATIVE_INT8_g)
+#define H5T_NATIVE_UINT8		(H5open(), H5T_NATIVE_UINT8_g)
+#define H5T_NATIVE_INT_LEAST8		(H5open(), H5T_NATIVE_INT_LEAST8_g)
+#define H5T_NATIVE_UINT_LEAST8		(H5open(), H5T_NATIVE_UINT_LEAST8_g)
+#define H5T_NATIVE_INT_FAST8 		(H5open(), H5T_NATIVE_INT_FAST8_g)
+#define H5T_NATIVE_UINT_FAST8		(H5open(), H5T_NATIVE_UINT_FAST8_g)
+__DLLVAR__ hid_t H5T_NATIVE_INT8_g;
+__DLLVAR__ hid_t H5T_NATIVE_UINT8_g;
+__DLLVAR__ hid_t H5T_NATIVE_INT_LEAST8_g;
+__DLLVAR__ hid_t H5T_NATIVE_UINT_LEAST8_g;
+__DLLVAR__ hid_t H5T_NATIVE_INT_FAST8_g;
+__DLLVAR__ hid_t H5T_NATIVE_UINT_FAST8_g;
+
+#define H5T_NATIVE_INT16		(H5open(), H5T_NATIVE_INT16_g)
+#define H5T_NATIVE_UINT16		(H5open(), H5T_NATIVE_UINT16_g)
+#define H5T_NATIVE_INT_LEAST16		(H5open(), H5T_NATIVE_INT_LEAST16_g)
+#define H5T_NATIVE_UINT_LEAST16		(H5open(), H5T_NATIVE_UINT_LEAST16_g)
+#define H5T_NATIVE_INT_FAST16		(H5open(), H5T_NATIVE_INT_FAST16_g)
+#define H5T_NATIVE_UINT_FAST16		(H5open(), H5T_NATIVE_UINT_FAST16_g)
+__DLLVAR__ hid_t H5T_NATIVE_INT16_g;
+__DLLVAR__ hid_t H5T_NATIVE_UINT16_g;
+__DLLVAR__ hid_t H5T_NATIVE_INT_LEAST16_g;
+__DLLVAR__ hid_t H5T_NATIVE_UINT_LEAST16_g;
+__DLLVAR__ hid_t H5T_NATIVE_INT_FAST16_g;
+__DLLVAR__ hid_t H5T_NATIVE_UINT_FAST16_g;
+
+#define H5T_NATIVE_INT32		(H5open(), H5T_NATIVE_INT32_g)
+#define H5T_NATIVE_UINT32		(H5open(), H5T_NATIVE_UINT32_g)
+#define H5T_NATIVE_INT_LEAST32		(H5open(), H5T_NATIVE_INT_LEAST32_g)
+#define H5T_NATIVE_UINT_LEAST32		(H5open(), H5T_NATIVE_UINT_LEAST32_g)
+#define H5T_NATIVE_INT_FAST32		(H5open(), H5T_NATIVE_INT_FAST32_g)
+#define H5T_NATIVE_UINT_FAST32		(H5open(), H5T_NATIVE_UINT_FAST32_g)
+__DLLVAR__ hid_t H5T_NATIVE_INT32_g;
+__DLLVAR__ hid_t H5T_NATIVE_UINT32_g;
+__DLLVAR__ hid_t H5T_NATIVE_INT_LEAST32_g;
+__DLLVAR__ hid_t H5T_NATIVE_UINT_LEAST32_g;
+__DLLVAR__ hid_t H5T_NATIVE_INT_FAST32_g;
+__DLLVAR__ hid_t H5T_NATIVE_UINT_FAST32_g;
+
+#define H5T_NATIVE_INT64		(H5open(), H5T_NATIVE_INT64_g)
+#define H5T_NATIVE_UINT64		(H5open(), H5T_NATIVE_UINT64_g)
+#define H5T_NATIVE_INT_LEAST64		(H5open(), H5T_NATIVE_INT_LEAST64_g)
+#define H5T_NATIVE_UINT_LEAST64 	(H5open(), H5T_NATIVE_UINT_LEAST64_g)
+#define H5T_NATIVE_INT_FAST64		(H5open(), H5T_NATIVE_INT_FAST64_g)
+#define H5T_NATIVE_UINT_FAST64		(H5open(), H5T_NATIVE_UINT_FAST64_g)
+__DLLVAR__ hid_t H5T_NATIVE_INT64_g;
+__DLLVAR__ hid_t H5T_NATIVE_UINT64_g;
+__DLLVAR__ hid_t H5T_NATIVE_INT_LEAST64_g;
+__DLLVAR__ hid_t H5T_NATIVE_UINT_LEAST64_g;
+__DLLVAR__ hid_t H5T_NATIVE_INT_FAST64_g;
+__DLLVAR__ hid_t H5T_NATIVE_UINT_FAST64_g;
 
 /* Operations defined on all data types */
 __DLL__ hid_t H5Topen(hid_t loc_id, const char *name);
diff --git a/src/H5detect.c b/src/H5detect.c
index 1d07df8..5930c54 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -995,106 +995,106 @@ main(void)
     print_header();
 
     /* C89 integer types */
-    DETECT_I(signed char,	  SCHAR,          d[nd]); nd++;
-    DETECT_I(unsigned char,	  UCHAR,          d[nd]); nd++;
-    DETECT_I(short,		  SHORT,          d[nd]); nd++;
-    DETECT_I(unsigned short,	  USHORT,         d[nd]); nd++;
-    DETECT_I(int,		  INT,	          d[nd]); nd++;
-    DETECT_I(unsigned int,	  UINT,	          d[nd]); nd++;
-    DETECT_I(long,		  LONG,	          d[nd]); nd++;
-    DETECT_I(unsigned long,	  ULONG,          d[nd]); nd++;
+    DETECT_I(signed char,	  SCHAR,        d[nd]); nd++;
+    DETECT_I(unsigned char,	  UCHAR,        d[nd]); nd++;
+    DETECT_I(short,		  SHORT,        d[nd]); nd++;
+    DETECT_I(unsigned short,	  USHORT,       d[nd]); nd++;
+    DETECT_I(int,		  INT,	        d[nd]); nd++;
+    DETECT_I(unsigned int,	  UINT,	        d[nd]); nd++;
+    DETECT_I(long,		  LONG,	        d[nd]); nd++;
+    DETECT_I(unsigned long,	  ULONG,        d[nd]); nd++;
 
     /*
      * C9x integer types.
      */
 #if SIZEOF_INT8_T>0
-    DETECT_I(int8_t, 		  INT8_T,         d[nd]); nd++;
+    DETECT_I(int8_t, 		  INT8,         d[nd]); nd++;
 #endif
 #if SIZEOF_UINT8_T>0
-    DETECT_I(uint8_t, 		  UINT8_T,        d[nd]); nd++;
+    DETECT_I(uint8_t, 		  UINT8,        d[nd]); nd++;
 #endif
 #if SIZEOF_INT_LEAST8_T>0
-    DETECT_I(int_least8_t, 	  INT_LEAST8_T,   d[nd]); nd++;
+    DETECT_I(int_least8_t, 	  INT_LEAST8,   d[nd]); nd++;
 #endif
 #if SIZEOF_UINT_LEAST8_T>0
-    DETECT_I(uint_least8_t, 	  UINT_LEAST8_T,  d[nd]); nd++;
+    DETECT_I(uint_least8_t, 	  UINT_LEAST8,  d[nd]); nd++;
 #endif
 #if SIZEOF_INT_FAST8_T>0
-    DETECT_I(int_fast8_t, 	  INT_FAST8_T,    d[nd]); nd++;
+    DETECT_I(int_fast8_t, 	  INT_FAST8,    d[nd]); nd++;
 #endif
 #if SIZEOF_UINT_FAST8_T>0
-    DETECT_I(uint_fast8_t, 	  UINT_FAST8_T,   d[nd]); nd++;
+    DETECT_I(uint_fast8_t, 	  UINT_FAST8,   d[nd]); nd++;
 #endif
 #if SIZEOF_INT16_T>0
-    DETECT_I(int16_t, 		  INT16_T,        d[nd]); nd++;
+    DETECT_I(int16_t, 		  INT16,        d[nd]); nd++;
 #endif
 #if SIZEOF_UINT16_T>0
-    DETECT_I(uint16_t, 		  UINT16_T,       d[nd]); nd++;
+    DETECT_I(uint16_t, 		  UINT16,       d[nd]); nd++;
 #endif
 #if SIZEOF_INT_LEAST16_T>0
-    DETECT_I(int_least16_t, 	  INT_LEAST16_T,  d[nd]); nd++;
+    DETECT_I(int_least16_t, 	  INT_LEAST16,  d[nd]); nd++;
 #endif
 #if SIZEOF_UINT_LEAST16_T>0
-    DETECT_I(uint_least16_t, 	  UINT_LEAST16_T, d[nd]); nd++;
+    DETECT_I(uint_least16_t, 	  UINT_LEAST16, d[nd]); nd++;
 #endif
 #if SIZEOF_INT_FAST16_T>0
-    DETECT_I(int_fast16_t, 	  INT_FAST16_T,   d[nd]); nd++;
+    DETECT_I(int_fast16_t, 	  INT_FAST16,   d[nd]); nd++;
 #endif
 #if SIZEOF_UINT_FAST16_T>0
-    DETECT_I(uint_fast16_t, 	  UINT_FAST16_T,  d[nd]); nd++;
+    DETECT_I(uint_fast16_t, 	  UINT_FAST16,  d[nd]); nd++;
 #endif
 #if SIZEOF_INT32_T>0
-    DETECT_I(int32_t, 		  INT32_T,        d[nd]); nd++;
+    DETECT_I(int32_t, 		  INT32,        d[nd]); nd++;
 #endif
 #if SIZEOF_UINT32_T>0
-    DETECT_I(uint32_t, 		  UINT32_T,       d[nd]); nd++;
+    DETECT_I(uint32_t, 		  UINT32,       d[nd]); nd++;
 #endif
 #if SIZEOF_INT_LEAST32_T>0
-    DETECT_I(int_least32_t, 	  INT_LEAST32_T,  d[nd]); nd++;
+    DETECT_I(int_least32_t, 	  INT_LEAST32,  d[nd]); nd++;
 #endif
 #if SIZEOF_UINT_LEAST32_T>0
-    DETECT_I(uint_least32_t, 	  UINT_LEAST32_T, d[nd]); nd++;
+    DETECT_I(uint_least32_t, 	  UINT_LEAST32, d[nd]); nd++;
 #endif
 #if SIZEOF_INT_FAST32_T>0
-    DETECT_I(int_fast32_t, 	  INT_FAST32_T,   d[nd]); nd++;
+    DETECT_I(int_fast32_t, 	  INT_FAST32,   d[nd]); nd++;
 #endif
 #if SIZEOF_UINT_FAST32_T>0
-    DETECT_I(uint_fast32_t, 	  UINT_FAST32_T,  d[nd]); nd++;
+    DETECT_I(uint_fast32_t, 	  UINT_FAST32,  d[nd]); nd++;
 #endif
 #if SIZEOF_INT64_T>0
-    DETECT_I(int64_t, 		  INT64_T,        d[nd]); nd++;
+    DETECT_I(int64_t, 		  INT64,        d[nd]); nd++;
 #endif
 #if SIZEOF_UINT64_T>0
-    DETECT_I(uint64_t, 		  UINT64_T,       d[nd]); nd++;
+    DETECT_I(uint64_t, 		  UINT64,       d[nd]); nd++;
 #endif
 #if SIZEOF_INT_LEAST64_T>0
-    DETECT_I(int_least64_t, 	  INT_LEAST64_T,  d[nd]); nd++;
+    DETECT_I(int_least64_t, 	  INT_LEAST64,  d[nd]); nd++;
 #endif
 #if SIZEOF_UINT_LEAST64_T>0
-    DETECT_I(uint_least64_t, 	  UINT_LEAST64_T, d[nd]); nd++;
+    DETECT_I(uint_least64_t, 	  UINT_LEAST64, d[nd]); nd++;
 #endif
 #if SIZEOF_INT_FAST64_T>0
-    DETECT_I(int_fast64_t, 	  INT_FAST64_T,   d[nd]); nd++;
+    DETECT_I(int_fast64_t, 	  INT_FAST64,   d[nd]); nd++;
 #endif
 #if SIZEOF_UINT_FAST64_T>0
-    DETECT_I(uint_fast64_t, 	  UINT_FAST64_T,  d[nd]); nd++;
+    DETECT_I(uint_fast64_t, 	  UINT_FAST64,  d[nd]); nd++;
 #endif
     
 #if SIZEOF_LONG_LONG>0
-    DETECT_I(long_long,		  LLONG,          d[nd]); nd++;
-    DETECT_I(unsigned long_long,  ULLONG,         d[nd]); nd++;
+    DETECT_I(long_long,		  LLONG,        d[nd]); nd++;
+    DETECT_I(unsigned long_long,  ULLONG,       d[nd]); nd++;
 #else
     /*
      * This architecture doesn't support an integer type larger than `long'
      * so we'll just make H5T_NATIVE_LLONG the same as H5T_NATIVE_LONG since
      * `long long' is probably equivalent to `long' here anyway.
      */
-    DETECT_I(long,		  LLONG,          d[nd]); nd++;
-    DETECT_I(unsigned long,	  ULLONG,         d[nd]); nd++;
+    DETECT_I(long,		  LLONG,        d[nd]); nd++;
+    DETECT_I(unsigned long,	  ULLONG,       d[nd]); nd++;
 #endif
 
-    DETECT_F(float,		  FLOAT,          d[nd]); nd++;
-    DETECT_F(double,		  DOUBLE,         d[nd]); nd++;
+    DETECT_F(float,		  FLOAT,        d[nd]); nd++;
+    DETECT_F(double,		  DOUBLE,       d[nd]); nd++;
 
 #if SIZEOF_DOUBLE == SIZEOF_LONG_DOUBLE
     /*
@@ -1103,9 +1103,9 @@ main(void)
      * some systems and `long double' is probably the same as `double' here
      * anyway.
      */
-    DETECT_F(double,		  LDOUBLE,        d[nd]); nd++;
+    DETECT_F(double,		  LDOUBLE,      d[nd]); nd++;
 #else
-    DETECT_F(long double,	  LDOUBLE,        d[nd]); nd++;
+    DETECT_F(long double,	  LDOUBLE,      d[nd]); nd++;
 #endif
 
     print_results (nd, d);
diff --git a/src/H5private.h b/src/H5private.h
index 5d973c5..df0b852 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -545,18 +545,18 @@ __DLL__ int HDfprintf (FILE *stream, const char *fmt, ...);
 #define HDgets(S)		gets(S)
 #define HDgetuid()		getuid()
 #define HDgmtime(T)		gmtime(T)
-#define HDisalnum(C)		isalnum(C)
-#define HDisalpha(C)		isalpha(C)
+#define HDisalnum(C)		isalnum((int)(C)) /*cast for solaris warning*/
+#define HDisalpha(C)		isalpha((int)(C)) /*cast for solaris warning*/
 #define HDisatty(F)		isatty(F)
-#define HDiscntrl(C)		iscntrl(C)
-#define HDisdigit(C)		isdigit(C)
-#define HDisgraph(C)		isgraph(C)
-#define HDislower(C)		islower(C)
-#define HDisprint(C)		isprint(C)
-#define HDispunct(C)		ispunct(C)
-#define HDisspace(C)		isspace(C)
-#define HDisupper(C)		isupper(C)
-#define HDisxdigit(C)		isxdigit(C)
+#define HDiscntrl(C)		iscntrl((int)(C)) /*cast for solaris warning*/
+#define HDisdigit(C)		isdigit((int)(C)) /*cast for solaris warning*/
+#define HDisgraph(C)		isgraph((int)(C)) /*cast for solaris warning*/
+#define HDislower(C)		islower((int)(C)) /*cast for solaris warning*/
+#define HDisprint(C)		isprint((int)(C)) /*cast for solaris warning*/
+#define HDispunct(C)		ispunct((int)(C)) /*cast for solaris warning*/
+#define HDisspace(C)		isspace((int)(C)) /*cast for solaris warning*/
+#define HDisupper(C)		isupper((int)(C)) /*cast for solaris warning*/
+#define HDisxdigit(C)		isxdigit((int)(C)) /*cast for solaris warning*/
 #define HDkill(P,S)		kill(P,S)
 #define HDlabs(X)		labs(X)
 #define HDldexp(X,N)		ldexp(X,N)