Basic alignment with async branch (#115)

* Basic alignment with async branch - trivial changes to reduce clutter in overall diff.

* Update minor error code to reflect change within library

* Update the error output to match library

1 files changed, 161 insertions, 162 deletions

diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index 8bebb98..68a1d79 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -230,7 +230,7 @@ typedef enum H5T_conv_ret_t {
  */
 typedef struct {
     size_t len; /**< Length of VL data (in base type units) */
-    void *p;    /**< Pointer to VL data */
+    void * p;   /**< Pointer to VL data */
 } hvl_t;
 
 /* Variable Length String information */
@@ -238,14 +238,14 @@ typedef struct {
  * Indicate that a string is variable length (null-terminated in C, instead of
  * fixed length)
  */
-#define H5T_VARIABLE    ((size_t)(-1))
+#define H5T_VARIABLE ((size_t)(-1))
 
 /* Opaque information */
 /**
  * Maximum length of an opaque tag
  * \internal This could be raised without too much difficulty
  */
-#define H5T_OPAQUE_TAG_MAX      256
+#define H5T_OPAQUE_TAG_MAX 256
 
 #ifdef __cplusplus
 extern "C" {
@@ -255,17 +255,16 @@ extern "C" {
  * All datatype conversion functions are...
  */
 //! [H5T_conv_t_snip]
-typedef herr_t (*H5T_conv_t) (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-      size_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf,
-      void *bkg, hid_t dset_xfer_plist);
+typedef herr_t (*H5T_conv_t)(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+                             size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist);
 //! [H5T_conv_t_snip]
 
 /**
  * Exception handler.  If an exception like overflow happenes during conversion,
  * this function is called if it's registered through H5Pset_type_conv_cb().
  */
-typedef H5T_conv_ret_t (*H5T_conv_except_func_t)(H5T_conv_except_t except_type,
-    hid_t src_id, hid_t dst_id, void *src_buf, void *dst_buf, void *user_data);
+typedef H5T_conv_ret_t (*H5T_conv_except_func_t)(H5T_conv_except_t except_type, hid_t src_id, hid_t dst_id,
+                                                 void *src_buf, void *dst_buf, void *user_data);
 
 /* When this header is included from a private header, don't make calls to H5open() */
 #undef H5OPEN
@@ -282,22 +281,22 @@ typedef H5T_conv_ret_t (*H5T_conv_except_func_t)(H5T_conv_except_t except_type,
  * \ingroup PDTIEEE
  * 32-bit big-endian IEEE floating-point numbers
  */
-#define H5T_IEEE_F32BE		(H5OPEN H5T_IEEE_F32BE_g)
+#define H5T_IEEE_F32BE (H5OPEN H5T_IEEE_F32BE_g)
 /**
  * \ingroup PDTIEEE
  * 32-bit little-endian IEEE floating-point numbers
  */
-#define H5T_IEEE_F32LE		(H5OPEN H5T_IEEE_F32LE_g)
+#define H5T_IEEE_F32LE (H5OPEN H5T_IEEE_F32LE_g)
 /**
  * \ingroup PDTIEEE
  * 64-bit big-endian IEEE floating-point numbers
  */
-#define H5T_IEEE_F64BE		(H5OPEN H5T_IEEE_F64BE_g)
+#define H5T_IEEE_F64BE (H5OPEN H5T_IEEE_F64BE_g)
 /**
  * \ingroup PDTIEEE
  * 64-bit little-endian IEEE floating-point numbers
  */
-#define H5T_IEEE_F64LE		(H5OPEN H5T_IEEE_F64LE_g)
+#define H5T_IEEE_F64LE (H5OPEN H5T_IEEE_F64LE_g)
 H5_DLLVAR hid_t H5T_IEEE_F32BE_g;
 H5_DLLVAR hid_t H5T_IEEE_F32LE_g;
 H5_DLLVAR hid_t H5T_IEEE_F64BE_g;
@@ -311,137 +310,137 @@ H5_DLLVAR hid_t H5T_IEEE_F64LE_g;
  * \ingroup PDTSTD
  * 8-bit big-endian signed integers
  */
-#define H5T_STD_I8BE		(H5OPEN H5T_STD_I8BE_g)
+#define H5T_STD_I8BE (H5OPEN H5T_STD_I8BE_g)
 /**
  * \ingroup PDTSTD
  * 8-bit little-endian signed integers
  */
-#define H5T_STD_I8LE		(H5OPEN H5T_STD_I8LE_g)
+#define H5T_STD_I8LE (H5OPEN H5T_STD_I8LE_g)
 /**
  * \ingroup PDTSTD
  * 16-bit big-endian signed integers
  */
-#define H5T_STD_I16BE		(H5OPEN H5T_STD_I16BE_g)
+#define H5T_STD_I16BE (H5OPEN H5T_STD_I16BE_g)
 /**
  * \ingroup PDTSTD
  * 16-bit little-endian signed integers
  */
-#define H5T_STD_I16LE		(H5OPEN H5T_STD_I16LE_g)
+#define H5T_STD_I16LE (H5OPEN H5T_STD_I16LE_g)
 /**
  * \ingroup PDTSTD
  * 32-bit big-endian signed integers
  */
-#define H5T_STD_I32BE		(H5OPEN H5T_STD_I32BE_g)
+#define H5T_STD_I32BE (H5OPEN H5T_STD_I32BE_g)
 /**
  * \ingroup PDTSTD
  * 32-bit little-endian signed integers
  */
-#define H5T_STD_I32LE		(H5OPEN H5T_STD_I32LE_g)
+#define H5T_STD_I32LE (H5OPEN H5T_STD_I32LE_g)
 /**
  * \ingroup PDTSTD
  * 64-bit big-endian signed integers
  */
-#define H5T_STD_I64BE		(H5OPEN H5T_STD_I64BE_g)
+#define H5T_STD_I64BE (H5OPEN H5T_STD_I64BE_g)
 /**
  * \ingroup PDTSTD
  * 64-bit little-endian signed integers
  */
-#define H5T_STD_I64LE		(H5OPEN H5T_STD_I64LE_g)
+#define H5T_STD_I64LE (H5OPEN H5T_STD_I64LE_g)
 /**
  * \ingroup PDTSTD
  * 8-bit big-endian unsigned integers
  */
-#define H5T_STD_U8BE		(H5OPEN H5T_STD_U8BE_g)
+#define H5T_STD_U8BE (H5OPEN H5T_STD_U8BE_g)
 /**
  * \ingroup PDTSTD
  * 8-bit little-endian unsigned integers
  */
-#define H5T_STD_U8LE		(H5OPEN H5T_STD_U8LE_g)
+#define H5T_STD_U8LE (H5OPEN H5T_STD_U8LE_g)
 /**
  * \ingroup PDTSTD
  * 16-bit big-endian unsigned integers
  */
-#define H5T_STD_U16BE		(H5OPEN H5T_STD_U16BE_g)
+#define H5T_STD_U16BE (H5OPEN H5T_STD_U16BE_g)
 /**
  * \ingroup PDTSTD
  * 16-bit little-endian unsigned integers
  */
-#define H5T_STD_U16LE		(H5OPEN H5T_STD_U16LE_g)
+#define H5T_STD_U16LE (H5OPEN H5T_STD_U16LE_g)
 /**
  * \ingroup PDTSTD
  * 32-bit big-endian unsigned integers
  */
-#define H5T_STD_U32BE		(H5OPEN H5T_STD_U32BE_g)
+#define H5T_STD_U32BE (H5OPEN H5T_STD_U32BE_g)
 /**
  * \ingroup PDTSTD
  * 32-bit little-endian unsigned integers
  */
-#define H5T_STD_U32LE		(H5OPEN H5T_STD_U32LE_g)
+#define H5T_STD_U32LE (H5OPEN H5T_STD_U32LE_g)
 /**
  * \ingroup PDTSTD
  * 64-bit big-endian unsigned integers
  */
-#define H5T_STD_U64BE		(H5OPEN H5T_STD_U64BE_g)
+#define H5T_STD_U64BE (H5OPEN H5T_STD_U64BE_g)
 /**
  * \ingroup PDTSTD
  * 64-bit little-endian unsigned integers
  */
-#define H5T_STD_U64LE		(H5OPEN H5T_STD_U64LE_g)
+#define H5T_STD_U64LE (H5OPEN H5T_STD_U64LE_g)
 /**
  * \ingroup PDTSTD
  * 8-bit big-endian bitfield
  */
-#define H5T_STD_B8BE		(H5OPEN H5T_STD_B8BE_g)
+#define H5T_STD_B8BE (H5OPEN H5T_STD_B8BE_g)
 /**
  * \ingroup PDTSTD
  * 8-bit little-endian bitfield
  */
-#define H5T_STD_B8LE		(H5OPEN H5T_STD_B8LE_g)
+#define H5T_STD_B8LE (H5OPEN H5T_STD_B8LE_g)
 /**
  * \ingroup PDTSTD
  * 16-bit big-endian bitfield
  */
-#define H5T_STD_B16BE		(H5OPEN H5T_STD_B16BE_g)
+#define H5T_STD_B16BE (H5OPEN H5T_STD_B16BE_g)
 /**
  * \ingroup PDTSTD
  * 16-bit little-endian bitfield
  */
-#define H5T_STD_B16LE		(H5OPEN H5T_STD_B16LE_g)
+#define H5T_STD_B16LE (H5OPEN H5T_STD_B16LE_g)
 /**
  * \ingroup PDTSTD
  * 32-bit big-endian bitfield
  */
-#define H5T_STD_B32BE		(H5OPEN H5T_STD_B32BE_g)
+#define H5T_STD_B32BE (H5OPEN H5T_STD_B32BE_g)
 /**
  * \ingroup PDTSTD
  * 32-bit little-endian bitfield
  */
-#define H5T_STD_B32LE		(H5OPEN H5T_STD_B32LE_g)
+#define H5T_STD_B32LE (H5OPEN H5T_STD_B32LE_g)
 /**
  * \ingroup PDTSTD
  * 64-bit big-endian bitfield
  */
-#define H5T_STD_B64BE		(H5OPEN H5T_STD_B64BE_g)
+#define H5T_STD_B64BE (H5OPEN H5T_STD_B64BE_g)
 /**
  * \ingroup PDTSTD
  * 64-bit little-endian bitfield
  */
-#define H5T_STD_B64LE		(H5OPEN H5T_STD_B64LE_g)
+#define H5T_STD_B64LE (H5OPEN H5T_STD_B64LE_g)
 /**
  * \ingroup PDTSTD
  * Object reference
  */
-#define H5T_STD_REF_OBJ         (H5OPEN H5T_STD_REF_OBJ_g)
+#define H5T_STD_REF_OBJ (H5OPEN H5T_STD_REF_OBJ_g)
 /**
  * \ingroup PDTSTD
  * Dataset region reference
  */
-#define H5T_STD_REF_DSETREG     (H5OPEN H5T_STD_REF_DSETREG_g)
+#define H5T_STD_REF_DSETREG (H5OPEN H5T_STD_REF_DSETREG_g)
 /**
  * \ingroup PDTSTD
  * Generic reference
  */
-#define H5T_STD_REF             (H5OPEN H5T_STD_REF_g)
+#define H5T_STD_REF (H5OPEN H5T_STD_REF_g)
 H5_DLLVAR hid_t H5T_STD_I8BE_g;
 H5_DLLVAR hid_t H5T_STD_I8LE_g;
 H5_DLLVAR hid_t H5T_STD_I16BE_g;
@@ -476,19 +475,19 @@ H5_DLLVAR hid_t H5T_STD_REF_g;
 /**
  * \ingroup PDTUNIX
  */
-#define H5T_UNIX_D32BE		(H5OPEN H5T_UNIX_D32BE_g)
+#define H5T_UNIX_D32BE (H5OPEN H5T_UNIX_D32BE_g)
 /**
  * \ingroup PDTUNIX
  */
-#define H5T_UNIX_D32LE		(H5OPEN H5T_UNIX_D32LE_g)
+#define H5T_UNIX_D32LE (H5OPEN H5T_UNIX_D32LE_g)
 /**
  * \ingroup PDTUNIX
  */
-#define H5T_UNIX_D64BE		(H5OPEN H5T_UNIX_D64BE_g)
+#define H5T_UNIX_D64BE (H5OPEN H5T_UNIX_D64BE_g)
 /**
  * \ingroup PDTUNIX
  */
-#define H5T_UNIX_D64LE		(H5OPEN H5T_UNIX_D64LE_g)
+#define H5T_UNIX_D64LE (H5OPEN H5T_UNIX_D64LE_g)
 H5_DLLVAR hid_t H5T_UNIX_D32BE_g;
 H5_DLLVAR hid_t H5T_UNIX_D32LE_g;
 H5_DLLVAR hid_t H5T_UNIX_D64BE_g;
@@ -523,72 +522,72 @@ H5_DLLVAR hid_t H5T_FORTRAN_S1_g;
  * \ingroup PDTX86
  * 8-bit little-endian signed (2's complement) integers for Intel CPUs
  */
-#define H5T_INTEL_I8		H5T_STD_I8LE
+#define H5T_INTEL_I8 H5T_STD_I8LE
 /**
  * \ingroup PDTX86
  * 16-bit little-endian signed (2's complement) integers for Intel CPUs
  */
-#define H5T_INTEL_I16		H5T_STD_I16LE
+#define H5T_INTEL_I16 H5T_STD_I16LE
 /**
  * \ingroup PDTX86
  * 32-bit little-endian signed (2's complement) integers for Intel CPUs
  */
-#define H5T_INTEL_I32		H5T_STD_I32LE
+#define H5T_INTEL_I32 H5T_STD_I32LE
 /**
  * \ingroup PDTX86
  * 64-bit little-endian signed (2's complement) integers for Intel CPUs
  */
-#define H5T_INTEL_I64		H5T_STD_I64LE
+#define H5T_INTEL_I64 H5T_STD_I64LE
 /**
  * \ingroup PDTX86
  * 8-bit little-endian unsigned integers for Intel CPUs
  */
-#define H5T_INTEL_U8		H5T_STD_U8LE
+#define H5T_INTEL_U8 H5T_STD_U8LE
 /**
  * \ingroup PDTX86
  * 16-bit little-endian unsigned integers for Intel CPUs
  */
-#define H5T_INTEL_U16		H5T_STD_U16LE
+#define H5T_INTEL_U16 H5T_STD_U16LE
 /**
  * \ingroup PDTX86
  * 32-bit little-endian unsigned integers for Intel CPUs
  */
-#define H5T_INTEL_U32		H5T_STD_U32LE
+#define H5T_INTEL_U32 H5T_STD_U32LE
 /**
  * \ingroup PDTX86
  * 64-bit little-endian unsigned integers for Intel CPUs
  */
-#define H5T_INTEL_U64		H5T_STD_U64LE
+#define H5T_INTEL_U64 H5T_STD_U64LE
 /**
  * \ingroup PDTX86
  * 8-bit little-endian bitfield for Intel CPUs
  */
-#define H5T_INTEL_B8		H5T_STD_B8LE
+#define H5T_INTEL_B8 H5T_STD_B8LE
 /**
  * \ingroup PDTX86
  * 16-bit little-endian bitfield for Intel CPUs
  */
-#define H5T_INTEL_B16		H5T_STD_B16LE
+#define H5T_INTEL_B16 H5T_STD_B16LE
 /**
  * \ingroup PDTX86
  * 32-bit little-endian bitfield for Intel CPUs
  */
-#define H5T_INTEL_B32		H5T_STD_B32LE
+#define H5T_INTEL_B32 H5T_STD_B32LE
 /**
  * \ingroup PDTX86
  * 64-bit little-endian bitfield for Intel CPUs
  */
-#define H5T_INTEL_B64		H5T_STD_B64LE
+#define H5T_INTEL_B64 H5T_STD_B64LE
 /**
  * \ingroup PDTX86
  * 32-bit little-endian IEEE floating-point numbers for Intel CPUs
  */
-#define H5T_INTEL_F32		H5T_IEEE_F32LE
+#define H5T_INTEL_F32 H5T_IEEE_F32LE
 /**
  * \ingroup PDTX86
  * 64-bit little-endian IEEE floating-point numbers for Intel CPUs
  */
-#define H5T_INTEL_F64		H5T_IEEE_F64LE
+#define H5T_INTEL_F64 H5T_IEEE_F64LE
 
 /*
  * These types are for DEC Alpha CPU's.  They are little endian with IEEE
@@ -598,72 +597,72 @@ H5_DLLVAR hid_t H5T_FORTRAN_S1_g;
  * \ingroup PDTALPHA
  * 8-bit little-endian signed (2's complement) integers for DEC Alpha CPUs
  */
-#define H5T_ALPHA_I8		H5T_STD_I8LE
+#define H5T_ALPHA_I8 H5T_STD_I8LE
 /**
  * \ingroup PDTALPHA
  * 16-bit little-endian signed (2's complement) integers for DEC Alpha CPUs
  */
-#define H5T_ALPHA_I16		H5T_STD_I16LE
+#define H5T_ALPHA_I16 H5T_STD_I16LE
 /**
  * \ingroup PDTALPHA
  * 32-bit little-endian signed (2's complement) integers for DEC Alpha CPUs
  */
-#define H5T_ALPHA_I32		H5T_STD_I32LE
+#define H5T_ALPHA_I32 H5T_STD_I32LE
 /**
  * \ingroup PDTALPHA
  * 64-bit little-endian signed (2's complement) integers for DEC Alpha CPUs
  */
-#define H5T_ALPHA_I64		H5T_STD_I64LE
+#define H5T_ALPHA_I64 H5T_STD_I64LE
 /**
  * \ingroup PDTALPHA
  * 8-bit little-endian unsigned integers for DEC Alpha CPUs
  */
-#define H5T_ALPHA_U8		H5T_STD_U8LE
+#define H5T_ALPHA_U8 H5T_STD_U8LE
 /**
  * \ingroup PDTALPHA
  * 16-bit little-endian unsigned integers for DEC Alpha CPUs
  */
-#define H5T_ALPHA_U16		H5T_STD_U16LE
+#define H5T_ALPHA_U16 H5T_STD_U16LE
 /**
  * \ingroup PDTALPHA
  * 32-bit little-endian unsigned integers for DEC Alpha CPUs
  */
-#define H5T_ALPHA_U32		H5T_STD_U32LE
+#define H5T_ALPHA_U32 H5T_STD_U32LE
 /**
  * \ingroup PDTALPHA
  * 64-bit little-endian unsigned integers for DEC Alpha CPUs
  */
-#define H5T_ALPHA_U64		H5T_STD_U64LE
+#define H5T_ALPHA_U64 H5T_STD_U64LE
 /**
  * \ingroup PDTALPHA
  * 8-bit little-endian bitfield for DEC Alpha CPUs
  */
-#define H5T_ALPHA_B8		H5T_STD_B8LE
+#define H5T_ALPHA_B8 H5T_STD_B8LE
 /**
  * \ingroup PDTALPHA
  * 16-bit little-endian bitfield for DEC Alpha CPUs
  */
-#define H5T_ALPHA_B16		H5T_STD_B16LE
+#define H5T_ALPHA_B16 H5T_STD_B16LE
 /**
  * \ingroup PDTALPHA
  * 32-bit little-endian bitfield for DEC Alpha CPUs
  */
-#define H5T_ALPHA_B32		H5T_STD_B32LE
+#define H5T_ALPHA_B32 H5T_STD_B32LE
 /**
  * \ingroup PDTALPHA
  * 64-bit little-endian bitfield for DEC Alpha CPUs
  */
-#define H5T_ALPHA_B64		H5T_STD_B64LE
+#define H5T_ALPHA_B64 H5T_STD_B64LE
 /**
  * \ingroup PDTALPHA
  * 32-bit little-endian IEEE floating-point numbers for DEC Alpha CPUs
  */
-#define H5T_ALPHA_F32		H5T_IEEE_F32LE
+#define H5T_ALPHA_F32 H5T_IEEE_F32LE
 /**
  * \ingroup PDTALPHA
  * 64-bit little-endian IEEE floating-point numbers for DEC Alpha CPUs
  */
-#define H5T_ALPHA_F64		H5T_IEEE_F64LE
+#define H5T_ALPHA_F64 H5T_IEEE_F64LE
 
 /*
  * These types are for MIPS cpu's commonly used in SGI systems. They are big
@@ -673,72 +672,72 @@ H5_DLLVAR hid_t H5T_FORTRAN_S1_g;
  * \ingroup PDTMIPS
  * 8-bit big-endian signed (2's complement) integers for SGI MIPS CPUs
  */
-#define H5T_MIPS_I8		H5T_STD_I8BE
+#define H5T_MIPS_I8 H5T_STD_I8BE
 /**
  * \ingroup PDTMIPS
  * 16-bit big-endian signed (2's complement) integers for SGI MIPS CPUs
  */
-#define H5T_MIPS_I16		H5T_STD_I16BE
+#define H5T_MIPS_I16 H5T_STD_I16BE
 /**
  * \ingroup PDTMIPS
  * 32-bit big-endian signed (2's complement) integers for SGI MIPS CPUs
  */
-#define H5T_MIPS_I32		H5T_STD_I32BE
+#define H5T_MIPS_I32 H5T_STD_I32BE
 /**
  * \ingroup PDTMIPS
  * 64-bit big-endian signed (2's complement) integers for SGI MIPS CPUs
  */
-#define H5T_MIPS_I64		H5T_STD_I64BE
+#define H5T_MIPS_I64 H5T_STD_I64BE
 /**
  * \ingroup PDTMIPS
  * 8-bit big-endian unsigned integers for SGI MIPS CPUs
  */
-#define H5T_MIPS_U8		H5T_STD_U8BE
+#define H5T_MIPS_U8 H5T_STD_U8BE
 /**
  * \ingroup PDTMIPS
  * 16-bit big-endian unsigned integers for SGI MIPS CPUs
  */
-#define H5T_MIPS_U16		H5T_STD_U16BE
+#define H5T_MIPS_U16 H5T_STD_U16BE
 /**
  * \ingroup PDTMIPS
  * 32-bit big-endian unsigned integers for SGI MIPS CPUs
  */
-#define H5T_MIPS_U32		H5T_STD_U32BE
+#define H5T_MIPS_U32 H5T_STD_U32BE
 /**
  * \ingroup PDTMIPS
  * 64-bit big-endian unsigned integers for SGI MIPS CPUs
  */
-#define H5T_MIPS_U64		H5T_STD_U64BE
+#define H5T_MIPS_U64 H5T_STD_U64BE
 /**
  * \ingroup PDTMIPS
  * 8-bit big-endian bitfield for SGI MIPS CPUs
  */
-#define H5T_MIPS_B8		H5T_STD_B8BE
+#define H5T_MIPS_B8 H5T_STD_B8BE
 /**
  * \ingroup PDTMIPS
  * 16-bit big-endian bitfield for SGI MIPS CPUs
  */
-#define H5T_MIPS_B16		H5T_STD_B16BE
+#define H5T_MIPS_B16 H5T_STD_B16BE
 /**
  * \ingroup PDTMIPS
  * 32-bit big-endian bitfield for SGI MIPS CPUs
  */
-#define H5T_MIPS_B32		H5T_STD_B32BE
+#define H5T_MIPS_B32 H5T_STD_B32BE
 /**
  * \ingroup PDTMIPS
  * 64-bit big-endian bitfield for SGI MIPS CPUs
  */
-#define H5T_MIPS_B64		H5T_STD_B64BE
+#define H5T_MIPS_B64 H5T_STD_B64BE
 /**
  * \ingroup PDTMIPS
  * 32-bit big-endian IEEE floating-point numbers for MIPS CPUs
  */
-#define H5T_MIPS_F32		H5T_IEEE_F32BE
+#define H5T_MIPS_F32 H5T_IEEE_F32BE
 /**
  * \ingroup PDTMIPS
  * 64-bit big-endian IEEE floating-point numbers for MIPS CPUs
  */
-#define H5T_MIPS_F64		H5T_IEEE_F64BE
+#define H5T_MIPS_F64 H5T_IEEE_F64BE
 
 /*
  * The VAX floating point types (i.e. in VAX byte order)
@@ -769,22 +768,22 @@ H5_DLLVAR hid_t H5T_VAX_F64_g;
  * \ingroup PDTNAT
  * C-style \c char
  */
-#define H5T_NATIVE_CHAR	  (CHAR_MIN?H5T_NATIVE_SCHAR:H5T_NATIVE_UCHAR)
+#define H5T_NATIVE_CHAR (CHAR_MIN ? H5T_NATIVE_SCHAR : H5T_NATIVE_UCHAR)
 /**
  * \ingroup PDTNAT
  * C-style \Code{signed char}
  */
-#define H5T_NATIVE_SCHAR  (H5OPEN H5T_NATIVE_SCHAR_g)
+#define H5T_NATIVE_SCHAR (H5OPEN H5T_NATIVE_SCHAR_g)
 /**
  * \ingroup PDTNAT
  * C-style \Code{unsigned char}
  */
-#define H5T_NATIVE_UCHAR  (H5OPEN H5T_NATIVE_UCHAR_g)
+#define H5T_NATIVE_UCHAR (H5OPEN H5T_NATIVE_UCHAR_g)
 /**
  * \ingroup PDTNAT
  * C-style \Code{short}
  */
-#define H5T_NATIVE_SHORT  (H5OPEN H5T_NATIVE_SHORT_g)
+#define H5T_NATIVE_SHORT (H5OPEN H5T_NATIVE_SHORT_g)
 /**
  * \ingroup PDTNAT
  * C-style \Code{unsigned short}
@@ -794,27 +793,27 @@ H5_DLLVAR hid_t H5T_VAX_F64_g;
  * \ingroup PDTNAT
  * C-style \Code{int}
  */
-#define H5T_NATIVE_INT    (H5OPEN H5T_NATIVE_INT_g)
+#define H5T_NATIVE_INT (H5OPEN H5T_NATIVE_INT_g)
 /**
  * \ingroup PDTNAT
  * C-style \Code{unsigned int}
  */
-#define H5T_NATIVE_UINT   (H5OPEN H5T_NATIVE_UINT_g)
+#define H5T_NATIVE_UINT (H5OPEN H5T_NATIVE_UINT_g)
 /**
  * \ingroup PDTNAT
  * C-style \Code{long}
  */
-#define H5T_NATIVE_LONG   (H5OPEN H5T_NATIVE_LONG_g)
+#define H5T_NATIVE_LONG (H5OPEN H5T_NATIVE_LONG_g)
 /**
  * \ingroup PDTNAT
  * C-style \Code{unsigned long}
  */
-#define H5T_NATIVE_ULONG  (H5OPEN H5T_NATIVE_ULONG_g)
+#define H5T_NATIVE_ULONG (H5OPEN H5T_NATIVE_ULONG_g)
 /**
  * \ingroup PDTNAT
  * C-style \Code{long long}
  */
-#define H5T_NATIVE_LLONG  (H5OPEN H5T_NATIVE_LLONG_g)
+#define H5T_NATIVE_LLONG (H5OPEN H5T_NATIVE_LLONG_g)
 /**
  * \ingroup PDTNAT
  * C-style \Code{unsigned long long}
@@ -824,13 +823,13 @@ H5_DLLVAR hid_t H5T_VAX_F64_g;
  * \ingroup PDTNAT
  * C-style \Code{float}
  */
-#define H5T_NATIVE_FLOAT  (H5OPEN H5T_NATIVE_FLOAT_g)
+#define H5T_NATIVE_FLOAT (H5OPEN H5T_NATIVE_FLOAT_g)
 /**
  * \ingroup PDTNAT
  * C-style \Code{double}
  */
 #define H5T_NATIVE_DOUBLE (H5OPEN H5T_NATIVE_DOUBLE_g)
-#if H5_SIZEOF_LONG_DOUBLE !=0
+#if H5_SIZEOF_LONG_DOUBLE != 0
 /**
  * \ingroup PDTNAT
  * C-style \Code{long double}
@@ -841,22 +840,22 @@ H5_DLLVAR hid_t H5T_VAX_F64_g;
  * \ingroup PDTNAT
  * HDF5 8-bit bitfield based on native types
  */
-#define H5T_NATIVE_B8     (H5OPEN H5T_NATIVE_B8_g)
+#define H5T_NATIVE_B8 (H5OPEN H5T_NATIVE_B8_g)
 /**
  * \ingroup PDTNAT
  * HDF5 16-bit bitfield based on native types
  */
-#define H5T_NATIVE_B16    (H5OPEN H5T_NATIVE_B16_g)
+#define H5T_NATIVE_B16 (H5OPEN H5T_NATIVE_B16_g)
 /**
  * \ingroup PDTNAT
  * HDF5 32-bit bitfield based on native types
  */
-#define H5T_NATIVE_B32    (H5OPEN H5T_NATIVE_B32_g)
+#define H5T_NATIVE_B32 (H5OPEN H5T_NATIVE_B32_g)
 /**
  * \ingroup PDTNAT
  * HDF5 64-bit bitfield based on native types
  */
-#define H5T_NATIVE_B64	  (H5OPEN H5T_NATIVE_B64_g)
+#define H5T_NATIVE_B64 (H5OPEN H5T_NATIVE_B64_g)
 /**
  * \ingroup PDTNAT
  * HDF5 opaque unit based on native types
@@ -866,12 +865,12 @@ H5_DLLVAR hid_t H5T_VAX_F64_g;
  * \ingroup PDTNAT
  * HDF5 address type based on native types
  */
-#define H5T_NATIVE_HADDR  (H5OPEN H5T_NATIVE_HADDR_g)
+#define H5T_NATIVE_HADDR (H5OPEN H5T_NATIVE_HADDR_g)
 /**
  * \ingroup PDTNAT
  * HDF5 size type based on native types
  */
-#define H5T_NATIVE_HSIZE  (H5OPEN H5T_NATIVE_HSIZE_g)
+#define H5T_NATIVE_HSIZE (H5OPEN H5T_NATIVE_HSIZE_g)
 /**
  * \ingroup PDTNAT
  * HDF5 signed size type based on native types
@@ -881,12 +880,12 @@ H5_DLLVAR hid_t H5T_VAX_F64_g;
  * \ingroup PDTNAT
  * HDF5 error code type based on native types
  */
-#define H5T_NATIVE_HERR	  (H5OPEN H5T_NATIVE_HERR_g)
+#define H5T_NATIVE_HERR (H5OPEN H5T_NATIVE_HERR_g)
 /**
  * \ingroup PDTNAT
  * HDF5 Boolean type based on native types
  */
-#define H5T_NATIVE_HBOOL	(H5OPEN H5T_NATIVE_HBOOL_g)
+#define H5T_NATIVE_HBOOL (H5OPEN H5T_NATIVE_HBOOL_g)
 H5_DLLVAR hid_t H5T_NATIVE_SCHAR_g;
 H5_DLLVAR hid_t H5T_NATIVE_UCHAR_g;
 H5_DLLVAR hid_t H5T_NATIVE_SHORT_g;
@@ -917,27 +916,27 @@ H5_DLLVAR hid_t H5T_NATIVE_HBOOL_g;
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_INT8	       (H5OPEN H5T_NATIVE_INT8_g)
+#define H5T_NATIVE_INT8 (H5OPEN H5T_NATIVE_INT8_g)
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_UINT8	   (H5OPEN H5T_NATIVE_UINT8_g)
+#define H5T_NATIVE_UINT8 (H5OPEN H5T_NATIVE_UINT8_g)
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_INT_LEAST8  (H5OPEN H5T_NATIVE_INT_LEAST8_g)
+#define H5T_NATIVE_INT_LEAST8 (H5OPEN H5T_NATIVE_INT_LEAST8_g)
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_UINT_LEAST8  (H5OPEN H5T_NATIVE_UINT_LEAST8_g)
+#define H5T_NATIVE_UINT_LEAST8 (H5OPEN H5T_NATIVE_UINT_LEAST8_g)
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_INT_FAST8 	(H5OPEN H5T_NATIVE_INT_FAST8_g)
+#define H5T_NATIVE_INT_FAST8 (H5OPEN H5T_NATIVE_INT_FAST8_g)
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_UINT_FAST8	(H5OPEN H5T_NATIVE_UINT_FAST8_g)
+#define H5T_NATIVE_UINT_FAST8 (H5OPEN H5T_NATIVE_UINT_FAST8_g)
 H5_DLLVAR hid_t H5T_NATIVE_INT8_g;
 H5_DLLVAR hid_t H5T_NATIVE_UINT8_g;
 H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST8_g;
@@ -948,27 +947,27 @@ H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST8_g;
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_INT16		(H5OPEN H5T_NATIVE_INT16_g)
+#define H5T_NATIVE_INT16 (H5OPEN H5T_NATIVE_INT16_g)
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_UINT16		(H5OPEN H5T_NATIVE_UINT16_g)
+#define H5T_NATIVE_UINT16 (H5OPEN H5T_NATIVE_UINT16_g)
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_INT_LEAST16	(H5OPEN H5T_NATIVE_INT_LEAST16_g)
+#define H5T_NATIVE_INT_LEAST16 (H5OPEN H5T_NATIVE_INT_LEAST16_g)
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_UINT_LEAST16	(H5OPEN H5T_NATIVE_UINT_LEAST16_g)
+#define H5T_NATIVE_UINT_LEAST16 (H5OPEN H5T_NATIVE_UINT_LEAST16_g)
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_INT_FAST16	(H5OPEN H5T_NATIVE_INT_FAST16_g)
+#define H5T_NATIVE_INT_FAST16 (H5OPEN H5T_NATIVE_INT_FAST16_g)
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_UINT_FAST16	(H5OPEN H5T_NATIVE_UINT_FAST16_g)
+#define H5T_NATIVE_UINT_FAST16 (H5OPEN H5T_NATIVE_UINT_FAST16_g)
 H5_DLLVAR hid_t H5T_NATIVE_INT16_g;
 H5_DLLVAR hid_t H5T_NATIVE_UINT16_g;
 H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST16_g;
@@ -979,27 +978,27 @@ H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST16_g;
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_INT32		(H5OPEN H5T_NATIVE_INT32_g)
+#define H5T_NATIVE_INT32 (H5OPEN H5T_NATIVE_INT32_g)
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_UINT32		(H5OPEN H5T_NATIVE_UINT32_g)
+#define H5T_NATIVE_UINT32 (H5OPEN H5T_NATIVE_UINT32_g)
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_INT_LEAST32	(H5OPEN H5T_NATIVE_INT_LEAST32_g)
+#define H5T_NATIVE_INT_LEAST32 (H5OPEN H5T_NATIVE_INT_LEAST32_g)
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_UINT_LEAST32	(H5OPEN H5T_NATIVE_UINT_LEAST32_g)
+#define H5T_NATIVE_UINT_LEAST32 (H5OPEN H5T_NATIVE_UINT_LEAST32_g)
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_INT_FAST32	(H5OPEN H5T_NATIVE_INT_FAST32_g)
+#define H5T_NATIVE_INT_FAST32 (H5OPEN H5T_NATIVE_INT_FAST32_g)
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_UINT_FAST32	(H5OPEN H5T_NATIVE_UINT_FAST32_g)
+#define H5T_NATIVE_UINT_FAST32 (H5OPEN H5T_NATIVE_UINT_FAST32_g)
 H5_DLLVAR hid_t H5T_NATIVE_INT32_g;
 H5_DLLVAR hid_t H5T_NATIVE_UINT32_g;
 H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST32_g;
@@ -1010,15 +1009,15 @@ H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST32_g;
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_INT64		(H5OPEN H5T_NATIVE_INT64_g)
+#define H5T_NATIVE_INT64 (H5OPEN H5T_NATIVE_INT64_g)
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_UINT64		(H5OPEN H5T_NATIVE_UINT64_g)
+#define H5T_NATIVE_UINT64 (H5OPEN H5T_NATIVE_UINT64_g)
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_INT_LEAST64	(H5OPEN H5T_NATIVE_INT_LEAST64_g)
+#define H5T_NATIVE_INT_LEAST64 (H5OPEN H5T_NATIVE_INT_LEAST64_g)
 /**
  * \ingroup PDTC9x
  */
@@ -1026,11 +1025,11 @@ H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST32_g;
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_INT_FAST64	(H5OPEN H5T_NATIVE_INT_FAST64_g)
+#define H5T_NATIVE_INT_FAST64 (H5OPEN H5T_NATIVE_INT_FAST64_g)
 /**
  * \ingroup PDTC9x
  */
-#define H5T_NATIVE_UINT_FAST64	(H5OPEN H5T_NATIVE_UINT_FAST64_g)
+#define H5T_NATIVE_UINT_FAST64 (H5OPEN H5T_NATIVE_UINT_FAST64_g)
 H5_DLLVAR hid_t H5T_NATIVE_INT64_g;
 H5_DLLVAR hid_t H5T_NATIVE_UINT64_g;
 H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST64_g;
@@ -1085,7 +1084,7 @@ H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST64_g;
  * \todo Create an example for H5Tcreate.
  *
  */
-H5_DLL hid_t  H5Tcreate(H5T_class_t type, size_t size);
+H5_DLL hid_t H5Tcreate(H5T_class_t type, size_t size);
 /**
  * \ingroup H5T
  *
@@ -1110,7 +1109,7 @@ H5_DLL hid_t  H5Tcreate(H5T_class_t type, size_t size);
  * \todo Create an example for H5Tcopy().
  *
  */
-H5_DLL hid_t  H5Tcopy(hid_t type_id);
+H5_DLL hid_t H5Tcopy(hid_t type_id);
 /**
  * \ingroup H5T
  *
@@ -1231,7 +1230,7 @@ H5_DLL herr_t H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lc
  * \since 1.8.0
  *
  */
-H5_DLL hid_t  H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id);
+H5_DLL hid_t H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id);
 /**
  * \ingroup H5T
  *
@@ -1304,7 +1303,7 @@ H5_DLL herr_t H5Tcommit_anon(hid_t loc_id, hid_t type_id, hid_t tcpl_id, hid_t t
  * \since 1.8.0
  *
  */
-H5_DLL hid_t  H5Tget_create_plist(hid_t type_id);
+H5_DLL hid_t H5Tget_create_plist(hid_t type_id);
 /**
  * \ingroup H5T
  *
@@ -1383,7 +1382,7 @@ H5_DLL herr_t H5Tencode(hid_t obj_id, void *buf, size_t *nalloc);
  *          resource leaks will not develop.
  *
  */
-H5_DLL hid_t  H5Tdecode(const void *buf);
+H5_DLL hid_t H5Tdecode(const void *buf);
 /**
  * \ingroup H5T
  *
@@ -1516,7 +1515,7 @@ H5_DLL herr_t H5Tpack(hid_t type_id);
  * \since 1.2.0
  *
  */
-H5_DLL hid_t  H5Tenum_create(hid_t base_id);
+H5_DLL hid_t H5Tenum_create(hid_t base_id);
 /**
  * \ingroup ENUM
  *
@@ -1683,7 +1682,7 @@ H5_DLL hid_t H5Tarray_create2(hid_t base_id, unsigned ndims, const hsize_t dim[/
  * \since 1.2.0
  *
  */
-H5_DLL int   H5Tget_array_ndims(hid_t type_id);
+H5_DLL int H5Tget_array_ndims(hid_t type_id);
 /**
  * \ingroup ARRAY
  *
@@ -1701,7 +1700,7 @@ H5_DLL int   H5Tget_array_ndims(hid_t type_id);
  * \since 1.2.0
  *
  */
-H5_DLL int   H5Tget_array_dims2(hid_t type_id, hsize_t dims[]);
+H5_DLL int H5Tget_array_dims2(hid_t type_id, hsize_t dims[]);
 
 /* Operations defined on opaque datatypes */
 /**
@@ -1745,7 +1744,7 @@ H5_DLL herr_t H5Tset_tag(hid_t type, const char *tag);
  *            the caller must free.
  *
  */
-H5_DLL char * H5Tget_tag(hid_t type);
+H5_DLL char *H5Tget_tag(hid_t type);
 
 /* Querying property values */
 /**
@@ -1766,7 +1765,7 @@ H5_DLL char * H5Tget_tag(hid_t type);
  *          resource leaks will not develop.
  *
  */
-H5_DLL hid_t       H5Tget_super(hid_t type);
+H5_DLL hid_t H5Tget_super(hid_t type);
 /**
  * \ingroup H5T
  *
@@ -1815,7 +1814,7 @@ H5_DLL H5T_class_t H5Tget_class(hid_t type_id);
  * \since 1.6.0
  *
  */
-H5_DLL htri_t      H5Tdetect_class(hid_t type_id, H5T_class_t cls);
+H5_DLL htri_t H5Tdetect_class(hid_t type_id, H5T_class_t cls);
 /**
  * \ingroup H5T
  *
@@ -1848,7 +1847,7 @@ H5_DLL htri_t      H5Tdetect_class(hid_t type_id, H5T_class_t cls);
  * \todo Create an example for H5Tget_size().
  *
  */
-H5_DLL size_t      H5Tget_size(hid_t type_id);
+H5_DLL size_t H5Tget_size(hid_t type_id);
 /**
  * \ingroup ATOM
  *
@@ -1894,7 +1893,7 @@ H5_DLL H5T_order_t H5Tget_order(hid_t type_id);
  * \since 1.2.0
  *
  */
-H5_DLL size_t      H5Tget_precision(hid_t type_id);
+H5_DLL size_t H5Tget_precision(hid_t type_id);
 /**
  * \ingroup ATOM
  *
@@ -1923,7 +1922,7 @@ H5_DLL size_t      H5Tget_precision(hid_t type_id);
  * \since 1.2.0
  *
  */
-H5_DLL int         H5Tget_offset(hid_t type_id);
+H5_DLL int H5Tget_offset(hid_t type_id);
 /**
  * \ingroup ATOM
  *
@@ -1942,7 +1941,7 @@ H5_DLL int         H5Tget_offset(hid_t type_id);
  * \since 1.2.0
  *
  */
-H5_DLL herr_t      H5Tget_pad(hid_t type_id, H5T_pad_t *lsb /*out*/, H5T_pad_t *msb /*out*/);
+H5_DLL herr_t H5Tget_pad(hid_t type_id, H5T_pad_t *lsb /*out*/, H5T_pad_t *msb /*out*/);
 /**
  * \ingroup ATOM
  *
@@ -2018,7 +2017,7 @@ H5_DLL size_t H5Tget_ebias(hid_t type_id);
  * \since 1.2.0
  *
  */
-H5_DLL H5T_norm_t  H5Tget_norm(hid_t type_id);
+H5_DLL H5T_norm_t H5Tget_norm(hid_t type_id);
 /**
  * \ingroup ATOM
  *
@@ -2037,7 +2036,7 @@ H5_DLL H5T_norm_t  H5Tget_norm(hid_t type_id);
  * \since 1.2.0
  *
  */
-H5_DLL H5T_pad_t   H5Tget_inpad(hid_t type_id);
+H5_DLL H5T_pad_t H5Tget_inpad(hid_t type_id);
 /**
  * \ingroup ATOM
  *
@@ -2058,7 +2057,7 @@ H5_DLL H5T_pad_t   H5Tget_inpad(hid_t type_id);
  * \since 1.2.0
  *
  */
-H5_DLL H5T_str_t   H5Tget_strpad(hid_t type_id);
+H5_DLL H5T_str_t H5Tget_strpad(hid_t type_id);
 /**
  * \ingroup COMPOUND
  *
@@ -2075,7 +2074,7 @@ H5_DLL H5T_str_t   H5Tget_strpad(hid_t type_id);
  * \since 1.2.0
  *
  */
-H5_DLL int         H5Tget_nmembers(hid_t type_id);
+H5_DLL int H5Tget_nmembers(hid_t type_id);
 /**
  * \ingroup COMPOUND
  *
@@ -2102,7 +2101,7 @@ H5_DLL int         H5Tget_nmembers(hid_t type_id);
  * \since 1.2.0
  *
  */
-H5_DLL char *      H5Tget_member_name(hid_t type_id, unsigned membno);
+H5_DLL char *H5Tget_member_name(hid_t type_id, unsigned membno);
 /**
  * \ingroup COMPOUND
  *
@@ -2124,7 +2123,7 @@ H5_DLL char *      H5Tget_member_name(hid_t type_id, unsigned membno);
  * \since 1.2.0
  *
  */
-H5_DLL int         H5Tget_member_index(hid_t type_id, const char *name);
+H5_DLL int H5Tget_member_index(hid_t type_id, const char *name);
 /**
  * \ingroup COMPOUND
  *
@@ -2148,7 +2147,7 @@ H5_DLL int         H5Tget_member_index(hid_t type_id, const char *name);
  * \since 1.2.0
  *
  */
-H5_DLL size_t      H5Tget_member_offset(hid_t type_id, unsigned membno);
+H5_DLL size_t H5Tget_member_offset(hid_t type_id, unsigned membno);
 /**
  * \ingroup COMPOUND
  *
@@ -2190,7 +2189,7 @@ H5_DLL H5T_class_t H5Tget_member_class(hid_t type_id, unsigned membno);
  * \since 1.2.0
  *
  */
-H5_DLL hid_t       H5Tget_member_type(hid_t type_id, unsigned membno);
+H5_DLL hid_t H5Tget_member_type(hid_t type_id, unsigned membno);
 /**
  * \ingroup ENUM
  *
@@ -2217,7 +2216,7 @@ H5_DLL hid_t       H5Tget_member_type(hid_t type_id, unsigned membno);
  * \since 1.2.0
  *
  */
-H5_DLL herr_t      H5Tget_member_value(hid_t type_id, unsigned membno, void *value /*out*/);
+H5_DLL herr_t H5Tget_member_value(hid_t type_id, unsigned membno, void *value /*out*/);
 /**
  * \ingroup ATOM
  *
@@ -2235,7 +2234,7 @@ H5_DLL herr_t      H5Tget_member_value(hid_t type_id, unsigned membno, void *val
  * \since 1.2.0
  *
  */
-H5_DLL H5T_cset_t  H5Tget_cset(hid_t type_id);
+H5_DLL H5T_cset_t H5Tget_cset(hid_t type_id);
 /**
  * \ingroup ATOM
  *
@@ -2258,7 +2257,7 @@ H5_DLL H5T_cset_t  H5Tget_cset(hid_t type_id);
  * \since 1.6.0
  *
  */
-H5_DLL htri_t      H5Tis_variable_str(hid_t type_id);
+H5_DLL htri_t H5Tis_variable_str(hid_t type_id);
 /**
  * \ingroup H5T
  *
@@ -2342,7 +2341,7 @@ H5_DLL htri_t      H5Tis_variable_str(hid_t type_id);
  * \since 1.6.0
  *
  */
-H5_DLL hid_t       H5Tget_native_type(hid_t type_id, H5T_direction_t direction);
+H5_DLL hid_t H5Tget_native_type(hid_t type_id, H5T_direction_t direction);
 
 /* Setting property values */
 /**
@@ -2805,7 +2804,7 @@ H5_DLL H5T_conv_t H5Tfind(hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata);
  * \since 1.8.0
  *
  */
-H5_DLL htri_t     H5Tcompiler_conv(hid_t src_id, hid_t dst_id);
+H5_DLL htri_t H5Tcompiler_conv(hid_t src_id, hid_t dst_id);
 /**
  * --------------------------------------------------------------------------
  * \ingroup CONV
@@ -2846,8 +2845,8 @@ H5_DLL htri_t     H5Tcompiler_conv(hid_t src_id, hid_t dst_id);
  * \version 1.4.0 \p nelmts parameter type changed to \ref hsize_t.
  *
  */
-H5_DLL herr_t     H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts, void *buf, void *background,
-                             hid_t plist_id);
+H5_DLL herr_t H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts, void *buf, void *background,
+                         hid_t plist_id);
 /**
  * \ingroup VLEN
  *
@@ -2870,7 +2869,7 @@ H5_DLL herr_t     H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts, void *bu
  * \since 1.12.0
  *
  */
-H5_DLL herr_t     H5Treclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf);
+H5_DLL herr_t H5Treclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
  *
@@ -2953,7 +2952,7 @@ H5_DLL herr_t H5Tcommit1(hid_t loc_id, const char *name, hid_t type_id);
  * \since 1.2.0
  *
  */
-H5_DLL hid_t  H5Topen1(hid_t loc_id, const char *name);
+H5_DLL hid_t H5Topen1(hid_t loc_id, const char *name);
 /**
  * \ingroup ARRAY
  *
@@ -2988,8 +2987,8 @@ H5_DLL hid_t  H5Topen1(hid_t loc_id, const char *name);
  * \since 1.4.0
  *
  */
-H5_DLL hid_t  H5Tarray_create1(hid_t base_id, int ndims, const hsize_t dim[/* ndims */],
-                               const int perm[/* ndims */]);
+H5_DLL hid_t H5Tarray_create1(hid_t base_id, int ndims, const hsize_t dim[/* ndims */],
+                              const int perm[/* ndims */]);
 /**
  * \ingroup ARRAY
  *
@@ -3016,7 +3015,7 @@ H5_DLL hid_t  H5Tarray_create1(hid_t base_id, int ndims, const hsize_t dim[/* nd
  * \since 1.2.0
  *
  */
-H5_DLL int    H5Tget_array_dims1(hid_t type_id, hsize_t dims[], int perm[]);
+H5_DLL int H5Tget_array_dims1(hid_t type_id, hsize_t dims[], int perm[]);
 
 #endif /* H5_NO_DEPRECATED_SYMBOLS */