[svn-r1078] Changes since 19990215

----------------------

./src/H5.c
	Fixed more dependency problems in H5_term_library(). There was
	a bug in the previous version that could cause the wrong EOF
	marker to be written to the boot block under certain
	circumstances. Hopefully this fixes it although I don't ready
	access to a test case (Mark Miller will test it).

./src/H5F.c
./src/H5Fprivate.h
	Added an H5F_close_all() that is similar to
	H5F_term_interface() but which doesn't close the
	interface. Files that don't have open object headers are
	closed, others are delayed until all object headers close. All
	files are flushed.

./src/H5ACprivate.h
./src/H5Bprivate.h
./src/H5Dprivate.h
./src/H5Eprivate.h
./src/H5Fprivate.h
./src/H5Gpkg.h
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5HGprivate.h
./src/H5HLprivate.h
./src/H5Iprivate.h
./src/H5MFprivate.h
./src/H5MMprivate.h
./src/H5Oprivate.h
./src/H5Pprivate.h
./src/H5Ppublic.h
./src/H5RAprivate.h
./src/H5Sprivate.h
./src/H5Spublic.h
./src/H5Tpkg.h
./src/H5Tprivate.h
./src/H5Tpublic.h
./src/H5Vprivate.h
./src/H5Zprivate.h
./src/H5private.h
./src/H5public.h
	Reindented after __DLL__ was added.

1 files changed, 301 insertions, 207 deletions

diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index 270c47a..1b3f2cf 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -156,223 +156,317 @@ __DLLVAR__ size_t	H5T_NATIVE_DOUBLE_ALIGN_g;
 __DLLVAR__ size_t	H5T_NATIVE_LDOUBLE_ALIGN_g;
 
 /* Conversion functions */
-__DLL__ herr_t H5T_conv_noop (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		      size_t nelmts, void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_noop(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+			     size_t nelmts, void *buf, void *bkg);
 
-__DLL__ herr_t H5T_conv_order (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		       size_t nelmts, void *_buf, void *bkg);
-__DLL__ herr_t H5T_conv_struct (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			size_t nelmts, void *_buf, void *bkg);
+__DLL__ herr_t H5T_conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+			      size_t nelmts, void *_buf, void *bkg);
+__DLL__ herr_t H5T_conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+			       size_t nelmts, void *_buf, void *bkg);
 __DLL__ herr_t H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, void *buf, void __unused__ *bkg);
-__DLL__ herr_t H5T_conv_i_i (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, void *_buf, void *bkg);
-__DLL__ herr_t H5T_conv_f_f (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, void *_buf, void *bkg);
-__DLL__ herr_t H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-		     size_t nelmts, void *_buf, void *bkg);
+			     size_t nelmts, void *buf, void __unused__ *bkg);
+__DLL__ herr_t H5T_conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+			    size_t nelmts, void *_buf, void *bkg);
+__DLL__ herr_t H5T_conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+			    size_t nelmts, void *_buf, void *bkg);
+__DLL__ herr_t H5T_conv_s_s(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+			    size_t nelmts, void *_buf, void *bkg);
 
-__DLL__ herr_t H5T_conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_schar_uchar(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uchar_schar(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_schar_short(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_schar_ushort(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uchar_short(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uchar_ushort(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_schar_int(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_schar_uint(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uchar_int(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uchar_uint(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_schar_long(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_schar_ulong(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uchar_long(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uchar_ulong(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_schar_llong(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_schar_ullong(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uchar_llong(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uchar_ullong(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
 
-__DLL__ herr_t H5T_conv_short_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ushort_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_short_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ushort_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			      size_t nelmts, void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_short_schar(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_short_uchar(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ushort_schar(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ushort_uchar(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_short_ushort(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ushort_short(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_short_int(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_short_uint(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ushort_int(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ushort_uint(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_short_long(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_short_ulong(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ushort_long(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ushort_ulong(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_short_llong(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_short_ullong(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ushort_llong(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ushort_ullong(hid_t src_id, hid_t dst_id,
+				      H5T_cdata_t *cdata, size_t nelmts,
+				      void *buf, void *bkg);
 
-__DLL__ herr_t H5T_conv_int_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			 size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			 size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			 size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_int_schar(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_int_uchar(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uint_schar(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uint_uchar(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_int_short(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_int_ushort(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uint_short(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uint_ushort(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_int_uint(hid_t src_id, hid_t dst_id,
+				 H5T_cdata_t *cdata, size_t nelmts,
+				 void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uint_int(hid_t src_id, hid_t dst_id,
+				 H5T_cdata_t *cdata, size_t nelmts,
+				 void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_int_long(hid_t src_id, hid_t dst_id,
+				 H5T_cdata_t *cdata, size_t nelmts,
+				 void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_int_ulong(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uint_long(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uint_ulong(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_int_llong(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_int_ullong(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uint_llong(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_uint_ullong(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
 
-__DLL__ herr_t H5T_conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			 size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_long_schar(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_long_uchar(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ulong_schar(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ulong_uchar(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_long_short(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_long_ushort(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ulong_short(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ulong_ushort(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_long_int(hid_t src_id, hid_t dst_id,
+				 H5T_cdata_t *cdata, size_t nelmts,
+				 void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_long_uint(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ulong_int(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_long_ulong(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ulong_long(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_long_llong(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_long_ullong(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ulong_ullong(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
 
-__DLL__ herr_t H5T_conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			 size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			  size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			   size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_ullong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			      size_t nelmts, void *buf, void *bkg);
-__DLL__ herr_t H5T_conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			      size_t nelmts, void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_llong_schar(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_llong_short(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_llong_ushort(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ullong_short(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ullong_ushort(hid_t src_id, hid_t dst_id,
+				      H5T_cdata_t *cdata, size_t nelmts,
+				      void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_llong_int(hid_t src_id, hid_t dst_id,
+				  H5T_cdata_t *cdata, size_t nelmts,
+				  void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_llong_uint(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ullong_int(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ullong_uint(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_llong_long(hid_t src_id, hid_t dst_id,
+				   H5T_cdata_t *cdata, size_t nelmts,
+				   void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_llong_ulong(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ullong_long(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ullong_ulong(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_llong_ullong(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_ullong_llong(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
 
-__DLL__ herr_t H5T_conv_i32le_f64le (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, void *_buf, void *bkg);
+__DLL__ herr_t H5T_conv_float_double(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_double_float(hid_t src_id, hid_t dst_id,
+				     H5T_cdata_t *cdata, size_t nelmts,
+				     void *buf, void *bkg);
+__DLL__ herr_t H5T_conv_i32le_f64le(hid_t src_id, hid_t dst_id,
+				    H5T_cdata_t *cdata, size_t nelmts,
+				    void *_buf, void *bkg);
 
 /* Bit twiddling functions */
-__DLL__ void H5T_bit_copy (uint8_t *dst, size_t dst_offset, const uint8_t *src,
-			   size_t src_offset, size_t size);
-__DLL__ void H5T_bit_set (uint8_t *buf, size_t offset, size_t size,
-			  hbool_t value);
-__DLL__ hsize_t H5T_bit_get_d (uint8_t *buf, size_t offset, size_t size);
-__DLL__ void H5T_bit_set_d (uint8_t *buf, size_t offset, size_t size, hsize_t val);
-__DLL__ ssize_t H5T_bit_find (uint8_t *buf, size_t offset, size_t size,
-			      H5T_sdir_t direction, hbool_t value);
+__DLL__ void H5T_bit_copy(uint8_t *dst, size_t dst_offset, const uint8_t *src,
+			  size_t src_offset, size_t size);
+__DLL__ void H5T_bit_set(uint8_t *buf, size_t offset, size_t size,
+			 hbool_t value);
+__DLL__ hsize_t H5T_bit_get_d(uint8_t *buf, size_t offset, size_t size);
+__DLL__ void H5T_bit_set_d(uint8_t *buf, size_t offset, size_t size,
+			   hsize_t val);
+__DLL__ ssize_t H5T_bit_find(uint8_t *buf, size_t offset, size_t size,
+			     H5T_sdir_t direction, hbool_t value);
 __DLL__ htri_t H5T_bit_inc(uint8_t *buf, size_t start, size_t size);
 
 #endif