Small changes discovered with mingw and windows defines moved

5 files changed, 221 insertions, 223 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c0915c8..39a9e3e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1139,7 +1139,7 @@ if (NOT ONLY_SHARED_LIBS)
   add_library (${HDF5_LIB_TARGET} STATIC ${common_SRCS} ${gen_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS} ${H5_GENERATED_HEADERS})
   target_include_directories (${HDF5_LIB_TARGET}
       PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
-      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>;$<BUILD_INTERFACE:${HDF5_BINARY_DIR}>"
   )
   target_compile_options(${HDF5_LIB_TARGET} PRIVATE "${HDF5_CMAKE_C_FLAGS}")
   target_compile_definitions(${HDF5_LIB_TARGET}
@@ -1176,7 +1176,7 @@ if (BUILD_SHARED_LIBS)
   target_include_directories (${HDF5_LIBSH_TARGET}
       PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
       PUBLIC "$<$<BOOL:${HDF5_ENABLE_HDFS}>:${HDFS_INCLUDE_DIR}>"
-      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>;$<BUILD_INTERFACE:${HDF5_BINARY_DIR}>"
   )
   target_compile_options(${HDF5_LIBSH_TARGET} PRIVATE "${HDF5_CMAKE_C_FLAGS}")
   target_compile_definitions(${HDF5_LIBSH_TARGET}
diff --git a/src/H5I.c b/src/H5I.c
index 1752e5e..11209d6 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -33,9 +33,9 @@
 #include "H5ACprivate.h"        /* Metadata cache                           */
 #include "H5CXprivate.h"        /* API Contexts                             */
 #include "H5Dprivate.h"         /* Datasets                                 */
-#include "H5Eprivate.h"		/* Error handling                           */
-#include "H5Fprivate.h"		/* File access				    */
-#include "H5FLprivate.h"	/* Free Lists                               */
+#include "H5Eprivate.h"        /* Error handling                           */
+#include "H5Fprivate.h"        /* File access                    */
+#include "H5FLprivate.h"    /* Free Lists                               */
 #include "H5Gprivate.h"         /* Groups                                   */
 #include "H5Ipkg.h"             /* IDs                                      */
 #include "H5MMprivate.h"        /* Memory management                        */
@@ -48,25 +48,25 @@
 /* Local Macros */
 
 /* Combine a Type number and an atom index into an atom */
-#define H5I_MAKE(g,i)	((((hid_t)(g) & TYPE_MASK) << ID_BITS) |	  \
-			     ((hid_t)(i) & ID_MASK))
+#define H5I_MAKE(g,i)    ((((hid_t)(g) & TYPE_MASK) << ID_BITS) |      \
+                ((hid_t)(i) & ID_MASK))
 
 /* Local typedefs */
 
 /* Atom information structure used */
 typedef struct H5I_id_info_t {
-    hid_t	id;		/* ID for this info			    */
-    unsigned	count;		/* ref. count for this atom		    */
+    hid_t    id;        /* ID for this info                */
+    unsigned    count;        /* ref. count for this atom            */
     unsigned    app_count;      /* ref. count of application visible atoms  */
-    const void	*obj_ptr;	/* pointer associated with the atom	    */
+    const void    *obj_ptr;    /* pointer associated with the atom        */
 } H5I_id_info_t;
 
 /* ID type structure used */
 typedef struct {
     const H5I_class_t *cls;     /* Pointer to ID class                      */
-    unsigned	init_count;	/* # of times this type has been initialized*/
-    uint64_t	id_count;	/* Current number of IDs held		    */
-    uint64_t	nextid;		/* ID to use for the next atom		    */
+    unsigned    init_count;    /* # of times this type has been initialized*/
+    uint64_t    id_count;    /* Current number of IDs held            */
+    uint64_t    nextid;        /* ID to use for the next atom            */
     H5I_id_info_t *last_info;   /* Info for most recent ID looked up        */
     H5SL_t      *ids;           /* Pointer to skip list that stores IDs     */
 } H5I_id_type_t;
@@ -145,7 +145,7 @@ static int H5I__iterate_pub_cb(void *obj, hid_t id, void *udata);
 static int H5I__find_id_cb(void *_item, void *_key, void *_udata);
 static int H5I__id_dump_cb(void *_item, void *_key, void *_udata);
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I_term_package
  *
@@ -156,14 +156,14 @@ static int H5I__id_dump_cb(void *_item, void *_key, void *_udata);
  * Return:      Success:    Positive if any action was taken that might
  *                          affect some other interface; zero otherwise.
  *
- *              Failure:	Negative
+ *              Failure:    Negative
  *
  *-------------------------------------------------------------------------
  */
 int
 H5I_term_package(void)
 {
-    int	n = 0;
+    int    n = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -197,7 +197,7 @@ H5I_term_package(void)
     FUNC_LEAVE_NOAPI(n)
 } /* end H5I_term_package() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Iregister_type
  *
@@ -278,7 +278,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iregister_type() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I_register_type
  *
@@ -293,7 +293,7 @@ done:
 herr_t
 H5I_register_type(const H5I_class_t *cls)
 {
-    H5I_id_type_t *type_ptr = NULL;	/* Ptr to the atomic type*/
+    H5I_id_type_t *type_ptr = NULL;    /* Ptr to the atomic type*/
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
@@ -328,7 +328,7 @@ H5I_register_type(const H5I_class_t *cls)
     type_ptr->init_count++;
 
 done:
-    if(ret_value < 0) {	/* Clean up on error */
+    if(ret_value < 0) {    /* Clean up on error */
         if(type_ptr) {
             if(type_ptr->ids)
                 H5SL_close(type_ptr->ids);
@@ -339,7 +339,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_register_type() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Itype_exists
  *
@@ -371,7 +371,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Itype_exists() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Inmembers
  *
@@ -382,8 +382,8 @@ done:
  *
  * Return:      SUCCEED/FAIL
  *
- * Programmer:	James Laird
- *		Nathaniel Furrer
+ * Programmer:    James Laird
+ *        Nathaniel Furrer
  *              Friday, April 23, 2004
  *
  *-------------------------------------------------------------------------
@@ -421,7 +421,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Inmembers() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I_nmembers
  *
@@ -432,7 +432,7 @@ done:
  *
  *              Failure:    Negative
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, March 24, 1999
  *
  *-------------------------------------------------------------------------
@@ -458,7 +458,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_nmembers() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I__unwrap
  *
@@ -502,7 +502,7 @@ H5I__unwrap(void *obj_ptr, H5I_type_t type)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__unwrap() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Iclear_type
  *
@@ -512,8 +512,8 @@ H5I__unwrap(void *obj_ptr, H5I_type_t type)
  *
  * Return:      SUCCEED/FAIL
  *
- * Programmer:	James Laird
- *		Nathaniel Furrer
+ * Programmer:    James Laird
+ *        Nathaniel Furrer
  *              Friday, April 23, 2004
  *
  *-------------------------------------------------------------------------
@@ -535,7 +535,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iclear_type() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I_clear_type
  *
@@ -544,7 +544,7 @@ done:
  *
  * Return:      SUCCEED/FAIL
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, March 24, 1999
  *
  *-------------------------------------------------------------------------
@@ -577,7 +577,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_clear_type() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I__clear_type_cb
  *
@@ -643,7 +643,7 @@ H5I__clear_type_cb(void *_id, void H5_ATTR_UNUSED *key, void *_udata)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__clear_type_cb() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Idestroy_type
  *
@@ -655,8 +655,8 @@ H5I__clear_type_cb(void *_id, void H5_ATTR_UNUSED *key, void *_udata)
  *
  * Return:      SUCCEED/FAIL
  *
- * Programmer:	Nathaniel Furrer
- *		James Laird
+ * Programmer:    Nathaniel Furrer
+ *        James Laird
  *
  *-------------------------------------------------------------------------
  */
@@ -677,7 +677,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Idestroy_type() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I__destroy_type
  *
@@ -688,15 +688,15 @@ done:
  *
  * Return:      SUCCEED/FAIL
  *
- * Programmer:	Nathaniel Furrer
- *		James Laird
+ * Programmer:    Nathaniel Furrer
+ *        James Laird
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
 H5I__destroy_type(H5I_type_t type)
 {
-    H5I_id_type_t *type_ptr;	/* ptr to the atomic type */
+    H5I_id_type_t *type_ptr;    /* ptr to the atomic type */
     herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
@@ -729,7 +729,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__destroy_type() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Iregister
  *
@@ -757,7 +757,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iregister() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I_register
  *
@@ -819,7 +819,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_register() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I_register_using_existing_id
  *
@@ -890,7 +890,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_register_using_existing_id() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I_subst
  *
@@ -900,8 +900,8 @@ done:
  *                          with the specified ID.
  *              Failure:    NULL
  *
- * Programmer:	Quincey Koziol
- *		Saturday, February 27, 2010
+ * Programmer:    Quincey Koziol
+ *        Saturday, February 27, 2010
  *
  *-------------------------------------------------------------------------
  */
@@ -909,7 +909,7 @@ void *
 H5I_subst(hid_t id, const void *new_object)
 {
     H5I_id_info_t *id_ptr;      /* Pointer to the atom */
-    void *ret_value = NULL;	/* Return value */
+    void *ret_value = NULL;    /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -927,7 +927,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_subst() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I_object
  *
@@ -943,8 +943,8 @@ done:
 void *
 H5I_object(hid_t id)
 {
-    H5I_id_info_t	*id_ptr;            /* Pointer to the new atom  */
-    void		    *ret_value = NULL;  /* Return value             */
+    H5I_id_info_t    *id_ptr;            /* Pointer to the new atom  */
+    void            *ret_value = NULL;  /* Return value             */
 
     FUNC_ENTER_NOAPI_NOERR
 
@@ -957,7 +957,7 @@ H5I_object(hid_t id)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_object() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Iobject_verify
  *
@@ -991,7 +991,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iobject_verify() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I_object_verify
  *
@@ -1002,8 +1002,8 @@ done:
  *                          specified ID.
  *              Failure:    NULL
  *
- * Programmer:	Quincey Koziol
- *		Wednesday, July 31, 2002
+ * Programmer:    Quincey Koziol
+ *        Wednesday, July 31, 2002
  *
  *-------------------------------------------------------------------------
  */
@@ -1026,7 +1026,7 @@ H5I_object_verify(hid_t id, H5I_type_t id_type)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5I_object_verify() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I_get_type
  *
@@ -1040,8 +1040,8 @@ H5I_object_verify(hid_t id, H5I_type_t id_type)
  *                          ID types).
  *              Failure:    H5I_BADID
  *
- * Programmer:	Robb Matzke
- *		Friday, February 19, 1999
+ * Programmer:    Robb Matzke
+ *        Friday, February 19, 1999
  *
  *-------------------------------------------------------------------------
  */
@@ -1060,7 +1060,7 @@ H5I_get_type(hid_t id)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_get_type() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Iget_type
  *
@@ -1087,13 +1087,13 @@ H5Iget_type(hid_t id)
     ret_value = H5I_get_type(id);
 
     if(ret_value <= H5I_BADID || (int)ret_value >= H5I_next_type || NULL == H5I_object(id))
-	HGOTO_DONE(H5I_BADID);
+    HGOTO_DONE(H5I_BADID);
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iget_type() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I_is_file_object
  *
@@ -1144,7 +1144,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value);
 } /* H5I_is_file_object() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Iremove_verify
  *
@@ -1157,8 +1157,8 @@ done:
  *                          calling H5I_object().
  *              Failure:    NULL
  *
- * Programmer:	James Laird
- *		Nathaniel Furrer
+ * Programmer:    James Laird
+ *        Nathaniel Furrer
  *
  *-------------------------------------------------------------------------
  */
@@ -1180,7 +1180,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iremove_verify() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I__remove_verify
  *
@@ -1192,15 +1192,15 @@ done:
  *                          calling H5I_object().
  *              Failure:    NULL
  *
- * Programmer:	James Laird
- *		Nat Furrer
+ * Programmer:    James Laird
+ *        Nat Furrer
  *
  *-------------------------------------------------------------------------
  */
 static void *
 H5I__remove_verify(hid_t id, H5I_type_t id_type)
 {
-    void * ret_value = NULL;	/*return value			*/
+    void * ret_value = NULL;    /*return value            */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -1213,7 +1213,7 @@ H5I__remove_verify(hid_t id, H5I_type_t id_type)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__remove_verify() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I__remove_common
  *
@@ -1232,8 +1232,8 @@ H5I__remove_verify(hid_t id, H5I_type_t id_type)
 static void *
 H5I__remove_common(H5I_id_type_t *type_ptr, hid_t id)
 {
-    H5I_id_info_t *curr_id;	/* Pointer to the current atom */
-    void *ret_value = NULL;	/* Return value */
+    H5I_id_info_t *curr_id;    /* Pointer to the current atom */
+    void *ret_value = NULL;    /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1258,7 +1258,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__remove_common() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I_remove
  *
@@ -1269,16 +1269,16 @@ done:
  *                          calling H5I_object().
  *              Failure:    NULL
  *
- * Programmer:	Unknown
+ * Programmer:    Unknown
  *
  *-------------------------------------------------------------------------
  */
 void *
 H5I_remove(hid_t id)
 {
-    H5I_id_type_t	*type_ptr;	        /* Pointer to the atomic type */
-    H5I_type_t		type;		        /* Atom's atomic type */
-    void *	        ret_value = NULL;	/* Return value */
+    H5I_id_type_t    *type_ptr;            /* Pointer to the atomic type */
+    H5I_type_t        type;                /* Atom's atomic type */
+    void *            ret_value = NULL;    /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -1298,7 +1298,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_remove() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Idec_ref
  *
@@ -1334,7 +1334,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Idec_ref() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I_dec_ref
  *
@@ -1380,7 +1380,7 @@ H5I_dec_ref(hid_t id)
      * file.  We have to close the dataset anyway. (SLU - 2010/9/7)
      */
     if(1 == id_ptr->count) {
-        H5I_id_type_t	*type_ptr;		/*ptr to the type	*/
+        H5I_id_type_t    *type_ptr;        /*ptr to the type    */
 
         /* Get the ID's type */
         type_ptr = H5I_id_type_list_g[H5I_TYPE(id)];
@@ -1404,7 +1404,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_dec_ref() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I_dec_app_ref
  *
@@ -1452,7 +1452,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_dec_app_ref() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I_dec_app_ref_always_close
  *
@@ -1494,7 +1494,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_dec_app_ref_always_close() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Iinc_ref
  *
@@ -1525,7 +1525,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iinc_ref() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I_inc_ref
  *
@@ -1563,7 +1563,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_inc_ref() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Iget_ref
  *
@@ -1594,7 +1594,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iget_ref() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I_get_ref
  *
@@ -1627,7 +1627,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_get_ref() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Iinc_type_ref
  *
@@ -1660,7 +1660,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iinc_ref() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I__inc_type_ref
  *
@@ -1694,14 +1694,14 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__inc_type_ref() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Idec_type_ref
  *
  * Purpose:     Decrements the reference count on an entire type of IDs.
  *              If the type reference count becomes zero then the type is
  *              destroyed along with all atoms in that type regardless of
- *              their reference counts.	 Destroying IDs involves calling
+ *              their reference counts.     Destroying IDs involves calling
  *              the free-func for each ID's object and then adding the ID
  *              struct to the ID free list.  Public interface to
  *              H5I_dec_type_ref.
@@ -1736,14 +1736,14 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Idec_type_ref() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I_dec_type_ref
  *
  * Purpose:     Decrements the reference count on an entire type of IDs.
  *              If the type reference count becomes zero then the type is
  *              destroyed along with all atoms in that type regardless of
- *              their reference counts.	 Destroying IDs involves calling
+ *              their reference counts.     Destroying IDs involves calling
  *              the free-func for each ID's object and then adding the ID
  *              struct to the ID free list.
  *              Returns the number of references to the type on success; a
@@ -1789,7 +1789,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_dec_type_ref() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Iget_type_ref
  *
@@ -1822,7 +1822,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iget_ref() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I__get_type_ref
  *
@@ -1857,7 +1857,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__get_type_ref() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Iis_valid
  *
@@ -1887,7 +1887,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iis_valid() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I__search_cb
  *
@@ -1913,7 +1913,7 @@ H5I__search_cb(void *obj, hid_t id, void *_udata)
 
     /* Set the return value based on the callback's return value */
     if(cb_ret_val > 0) {
-        ret_value = H5_ITER_STOP;	/* terminate iteration early */
+        ret_value = H5_ITER_STOP;    /* terminate iteration early */
         udata->ret_obj = obj;       /* also set out parameter */
     }
     else if(cb_ret_val < 0)
@@ -1922,7 +1922,7 @@ H5I__search_cb(void *obj, hid_t id, void *_udata)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__search_cb() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Isearch
  *
@@ -1973,7 +1973,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Isearch() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I__iterate_pub_cb
  *
@@ -2004,7 +2004,7 @@ H5I__iterate_pub_cb(void H5_ATTR_UNUSED *obj, hid_t id, void *_udata)
 
     /* Set the return value based on the callback's return value */
     if(cb_ret_val > 0)
-        ret_value = H5_ITER_STOP;	/* terminate iteration early */
+        ret_value = H5_ITER_STOP;    /* terminate iteration early */
     else if(cb_ret_val < 0)
         ret_value = H5_ITER_ERROR;  /* indicate failure (which terminates iteration) */
     else
@@ -2013,7 +2013,7 @@ H5I__iterate_pub_cb(void H5_ATTR_UNUSED *obj, hid_t id, void *_udata)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__iterate_pub_cb() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Iiterate
  *
@@ -2060,7 +2060,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iiterate() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I__iterate_cb
  *
@@ -2100,7 +2100,7 @@ H5I__iterate_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
 
         /* Set the return value based on the callback's return value */
         if(cb_ret_val > 0)
-            ret_value = H5_ITER_STOP;	/* terminate iteration early */
+            ret_value = H5_ITER_STOP;    /* terminate iteration early */
         else if(cb_ret_val < 0)
             ret_value = H5_ITER_ERROR;  /* indicate failure (which terminates iteration) */
     } /* end if */
@@ -2108,9 +2108,9 @@ H5I__iterate_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__iterate_cb() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	H5I_iterate
+ * Function:    H5I_iterate
  *
  * Purpose:     Apply function FUNC to each member of type TYPE (with
  *              non-zero application reference count if app_ref is TRUE).
@@ -2138,7 +2138,7 @@ herr_t
 H5I_iterate(H5I_type_t type, H5I_search_func_t func, void *udata, hbool_t app_ref)
 {
     H5I_id_type_t *type_ptr;            /* Pointer to the type  */
-    herr_t	   ret_value = SUCCEED;     /* Return value         */
+    herr_t       ret_value = SUCCEED;     /* Return value         */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -2167,7 +2167,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_iterate() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I__find_id
  *
@@ -2183,9 +2183,9 @@ done:
 static H5I_id_info_t *
 H5I__find_id(hid_t id)
 {
-    H5I_type_t		type;			/*ID's type		*/
-    H5I_id_type_t	*type_ptr;		/*ptr to the type	*/
-    H5I_id_info_t	*ret_value = NULL;	/* Return value */
+    H5I_type_t        type;            /*ID's type        */
+    H5I_id_type_t    *type_ptr;        /*ptr to the type    */
+    H5I_id_info_t    *ret_value = NULL;    /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -2212,7 +2212,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__find_id() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Iget_name
  *
@@ -2263,7 +2263,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iget_name() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Iget_file_id
  *
@@ -2307,7 +2307,7 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iget_file_id() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I__find_id_cb
  *
@@ -2345,7 +2345,7 @@ H5I__find_id_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I__find_id_cb() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I_find_id
  *
@@ -2394,7 +2394,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5I_find_id() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I__id_dump_cb
  *
@@ -2414,9 +2414,9 @@ H5I__id_dump_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
 
     FUNC_ENTER_STATIC_NOERR
 
-    HDfprintf(stderr, "		 id = %lu\n", (unsigned long)(item->id));
-    HDfprintf(stderr, "		 count = %u\n", item->count);
-    HDfprintf(stderr, "		 obj   = 0x%08lx\n", (unsigned long)(item->obj_ptr));
+    HDfprintf(stderr, "         id = %lu\n", (unsigned long)(item->id));
+    HDfprintf(stderr, "         count = %u\n", item->count);
+    HDfprintf(stderr, "         obj   = 0x%08p\n", item->obj_ptr);
 
     /* Get the group location, so we get get the name */
     switch (type) {
@@ -2482,7 +2482,7 @@ H5I__id_dump_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
     FUNC_LEAVE_NOAPI(H5_ITER_CONT)
 } /* end H5I__id_dump_cb() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5I_dump_ids_for_type
  *
@@ -2505,14 +2505,14 @@ H5I_dump_ids_for_type(H5I_type_t type)
     if(type_ptr) {
 
         /* Header */
-        HDfprintf(stderr, "	 init_count = %u\n", type_ptr->init_count);
-        HDfprintf(stderr, "	 reserved   = %u\n", type_ptr->cls->reserved);
-        HDfprintf(stderr, "	 id_count   = %llu\n", (unsigned long long)type_ptr->id_count);
-        HDfprintf(stderr, "	 nextid	    = %llu\n", (unsigned long long)type_ptr->nextid);
+        HDfprintf(stderr, "     init_count = %u\n", type_ptr->init_count);
+        HDfprintf(stderr, "     reserved   = %u\n", type_ptr->cls->reserved);
+        HDfprintf(stderr, "     id_count   = %llu\n", (unsigned long long)type_ptr->id_count);
+        HDfprintf(stderr, "     nextid        = %llu\n", (unsigned long long)type_ptr->nextid);
 
         /* List */
         if(type_ptr->id_count > 0) {
-            HDfprintf(stderr, "	 List:\n");
+            HDfprintf(stderr, "     List:\n");
             H5SL_iterate(type_ptr->ids, H5I__id_dump_cb, &type);
         }
     }
diff --git a/src/H5Tdbg.c b/src/H5Tdbg.c
index 693174a..7af736a 100644
--- a/src/H5Tdbg.c
+++ b/src/H5Tdbg.c
@@ -13,11 +13,11 @@
 
 /*-------------------------------------------------------------------------
  *
- * Created:		H5Tdbg.c
- *			Jul 19 2007
- *			Quincey Koziol <koziol@hdfgroup.org>
+ * Created:        H5Tdbg.c
+ *            Jul 19 2007
+ *            Quincey Koziol <koziol@hdfgroup.org>
  *
- * Purpose:		Dump debugging information about a datatype
+ * Purpose:        Dump debugging information about a datatype
  *
  *-------------------------------------------------------------------------
  */
@@ -72,7 +72,7 @@
 /*******************/
 
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5T__print_stats
  *
@@ -99,18 +99,18 @@ H5T__print_stats(H5T_path_t H5_ATTR_UNUSED * path, int H5_ATTR_UNUSED * nprint/*
 
 #ifdef H5T_DEBUG
     if(H5DEBUG(T) && path->stats.ncalls > 0) {
-        hsize_t	nbytes;
-        char	bandwidth[32];
-
-	if(nprint && 0 == (*nprint)++) {
-	    HDfprintf(H5DEBUG(T), "H5T: type conversion statistics:\n");
-	    HDfprintf(H5DEBUG(T), "   %-16s %10s %10s %8s %8s %8s %10s\n",
-		       "Conversion", "Elmts", "Calls", "User",
-		       "System", "Elapsed", "Bandwidth");
-	    HDfprintf(H5DEBUG(T), "   %-16s %10s %10s %8s %8s %8s %10s\n",
-		       "----------", "-----", "-----", "----",
-		       "------", "-------", "---------");
-	} /* end if */
+        hsize_t    nbytes;
+        char    bandwidth[32];
+
+    if(nprint && 0 == (*nprint)++) {
+        HDfprintf(H5DEBUG(T), "H5T: type conversion statistics:\n");
+        HDfprintf(H5DEBUG(T), "   %-16s %10s %10s %8s %8s %8s %10s\n",
+            "Conversion", "Elmts", "Calls", "User",
+            "System", "Elapsed", "Bandwidth");
+        HDfprintf(H5DEBUG(T), "   %-16s %10s %10s %8s %8s %8s %10s\n",
+            "----------", "-----", "-----", "----",
+            "------", "-------", "---------");
+    } /* end if */
 
         if(path->src && path->dst)
             nbytes = MAX(H5T_get_size(path->src), H5T_get_size(path->dst));
@@ -121,23 +121,23 @@ H5T__print_stats(H5T_path_t H5_ATTR_UNUSED * path, int H5_ATTR_UNUSED * nprint/*
         else
             nbytes = 0;
 
-	nbytes *= path->stats.nelmts;
+    nbytes *= path->stats.nelmts;
         H5_bandwidth(bandwidth, (double)nbytes, path->stats.times.elapsed);
         HDfprintf(H5DEBUG(T), "   %-16s %10Hd %10d %8T %8T %8T %10s\n",
-		   path->name,
-		   path->stats.nelmts,
-		   path->stats.ncalls,
+        path->name,
+        path->stats.nelmts,
+        path->stats.ncalls,
                    path->stats.times.user,
                    path->stats.times.system,
                    path->stats.times.elapsed,
-		   bandwidth);
+        bandwidth);
     } /* end if */
 #endif
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5T__print_stats() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5T_debug
  *
@@ -406,18 +406,18 @@ H5T_debug(const H5T_t *dt, FILE *stream)
         } /* end else */
     }
     else if (H5T_ENUM == dt->shared->type) {
-        size_t	base_size;
+        size_t    base_size;
 
         /* Enumeration data type */
         HDfprintf(stream, " ");
         H5T_debug(dt->shared->parent, stream);
         base_size = dt->shared->parent->shared->size;
         for (i = 0; i < dt->shared->u.enumer.nmembs; i++) {
-            size_t	k;
+            size_t    k;
 
             HDfprintf(stream, "\n\"%s\" = 0x", dt->shared->u.enumer.name[i]);
             for (k = 0; k < base_size; k++)
-                HDfprintf(stream, "%02lx", (unsigned long)((uint8_t *)dt->shared->u.enumer.value + (i * base_size) + k));
+                HDfprintf(stream, "%02p", ((uint8_t *)dt->shared->u.enumer.value + (i * base_size) + k));
         } /* end for */
         HDfprintf(stream, "\n");
     }
diff --git a/src/H5public.h b/src/H5public.h
index 0fd9f3b..93cb2ea 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -26,7 +26,7 @@
  * it via H5public.h.  The #ifndef _H5public_H guard above would
  * prevent repeated include.
  */
-#include "H5pubconf.h"		/*from configure                             */
+#include "H5pubconf.h"        /*from configure                             */
 
 /* API Version macro wrapper definitions */
 #include "H5version.h"
@@ -38,58 +38,20 @@
 #include <sys/types.h>
 #endif
 #ifdef H5_STDC_HEADERS
-#   include <limits.h>		/*for H5T_NATIVE_CHAR defn in H5Tpublic.h    */
+#   include <limits.h>        /*for H5T_NATIVE_CHAR defn in H5Tpublic.h    */
 #   include <stdarg.h>      /*for variadic functions in H5VLpublic.h     */
 #endif
 #ifndef __cplusplus
 # ifdef H5_HAVE_STDINT_H
-#   include <stdint.h>		/*for C9x types				     */
+#   include <stdint.h>        /*for C9x types                     */
 # endif
 #else
 # ifdef H5_HAVE_STDINT_H_CXX
-#   include <stdint.h>		/*for C9x types	when include from C++	     */
+#   include <stdint.h>        /*for C9x types    when include from C++         */
 # endif
 #endif
 #ifdef H5_HAVE_INTTYPES_H
 #   include <inttypes.h>        /* C99/POSIX.1 header for uint64_t, PRIu64 */
-#else /* H5_HAVE_INTTYPES_H */
-/* The following definitions should be suitable for 64-bit Windows, which is
- * LLP64, and for 32-bit Windows, which is ILP32.  Those are the only
- * platforms where <inttypes.h> is likely to be missing.  VS2015 and later
- * *may* provide these definitions.
- */
-#ifdef _WIN64
-#       define PRIdPTR "lld"
-#       define PRIoPTR "llo"
-#       define PRIuPTR "llu"
-#       define PRIxPTR "llx"
-#else /* _WIN64 */
-#       define PRIdPTR "ld"
-#       define PRIoPTR "lo"
-#       define PRIuPTR "lu"
-#       define PRIxPTR "lx"
-#endif /* _WIN64 */
-
-#   define PRId8 "d"
-#   define PRIo8 "o"
-#   define PRIu8 "u"
-#   define PRIx8 "x"
-#   define PRId16 "d"
-#   define PRIo16 "o"
-#   define PRIu16 "u"
-#   define PRIx16 "x"
-#   define PRId32 "d"
-#   define PRIo32 "o"
-#   define PRIu32 "u"
-#   define PRIx32 "x"
-#   define PRId64 "lld"
-#   define PRIo64 "llo"
-#   define PRIu64 "llu"
-#   define PRIx64 "llx"
-#   define PRIdMAX "lld"
-#   define PRIoMAX "llo"
-#   define PRIuMAX "llu"
-#   define PRIxMAX "llx"
 #endif
 #ifdef H5_HAVE_STDDEF_H
 #   include <stddef.h>
@@ -99,7 +61,7 @@
 #   define MPICH_SKIP_MPICXX 1
 #   define OMPI_SKIP_MPICXX 1
 #   include <mpi.h>
-#ifndef MPI_FILE_NULL		/*MPIO may be defined in mpi.h already       */
+#ifndef MPI_FILE_NULL        /*MPIO may be defined in mpi.h already       */
 #   include <mpio.h>
 #endif
 #endif
@@ -132,15 +94,15 @@ extern "C" {
 #endif
 
 /* Version numbers */
-#define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
-#define H5_VERS_MINOR	13	/* For minor interface/format changes  	     */
-#define H5_VERS_RELEASE	0	/* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE ""	/* For pre-releases like snap0       */
-				/* Empty string for real releases.           */
+#define H5_VERS_MAJOR    1    /* For major interface/format changes           */
+#define H5_VERS_MINOR    13    /* For minor interface/format changes           */
+#define H5_VERS_RELEASE    0    /* For tweaks, bug-fixes, or development     */
+#define H5_VERS_SUBRELEASE ""    /* For pre-releases like snap0       */
+                /* Empty string for real releases.           */
 #define H5_VERS_INFO    "HDF5 library version: 1.13.0"      /* Full version string */
 
-#define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
-				        H5_VERS_RELEASE)
+#define H5check()    H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,          \
+                        H5_VERS_RELEASE)
 
 /* macros for comparing the version */
 #define H5_VERSION_GE(Maj,Min,Rel) \
@@ -160,8 +122,8 @@ extern "C" {
  * 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 = H5Dopen2(file, name)) < 0)
- *	    fprintf(stderr, "unable to open the requested dataset\n");
+ *     if((dset = H5Dopen2(file, name)) < 0)
+ *        fprintf(stderr, "unable to open the requested dataset\n");
  */
 typedef int herr_t;
 
@@ -173,13 +135,13 @@ typedef int herr_t;
  * (false), positive (true), or negative (failure). The proper way to test
  * for truth from a htri_t function is:
  *
- * 	if ((retval = H5Tcommitted(type))>0) {
- *	    printf("data type is committed\n");
- *	} else if (!retval) {
- * 	    printf("data type is not committed\n");
- *	} else {
- * 	    printf("error determining whether data type is committed\n");
- *	}
+ *     if ((retval = H5Tcommitted(type))>0) {
+ *        printf("data type is committed\n");
+ *    } else if (!retval) {
+ *         printf("data type is not committed\n");
+ *    } else {
+ *         printf("error determining whether data type is committed\n");
+ *    }
  */
 #ifdef H5_HAVE_STDBOOL_H
   #include <stdbool.h>
@@ -221,8 +183,8 @@ typedef long long ssize_t;
  */
 #if H5_SIZEOF_LONG_LONG >= 8
 H5_GCC_DIAG_OFF(long-long)
-typedef unsigned long long 	hsize_t;
-typedef signed long long	hssize_t;
+typedef unsigned long long     hsize_t;
+typedef signed long long    hssize_t;
 H5_GCC_DIAG_ON(long-long)
 #       define H5_SIZEOF_HSIZE_T H5_SIZEOF_LONG_LONG
 #       define H5_SIZEOF_HSSIZE_T H5_SIZEOF_LONG_LONG
@@ -267,7 +229,7 @@ H5_GCC_DIAG_ON(long-long)
 #else
 #   error "nothing appropriate for H5_PRINTF_HADDR_FMT"
 #endif
-#define HADDR_MAX		(HADDR_UNDEF-1)
+#define HADDR_MAX        (HADDR_UNDEF-1)
 
 /* uint32_t type is used for creation order field for messages.  It may be
  * defined in Posix.1g, otherwise it is defined here.
@@ -335,7 +297,7 @@ typedef enum {
     H5_ITER_INC,                /* Increasing order */
     H5_ITER_DEC,                /* Decreasing order */
     H5_ITER_NATIVE,             /* No particular order, whatever is fastest */
-    H5_ITER_N		        /* Number of iteration orders */
+    H5_ITER_N                /* Number of iteration orders */
 } H5_iter_order_t;
 
 /* Iteration callback values */
@@ -352,10 +314,10 @@ typedef enum {
  * links in groups/attributes on objects.
  */
 typedef enum H5_index_t {
-    H5_INDEX_UNKNOWN = -1,	/* Unknown index type			*/
-    H5_INDEX_NAME,		/* Index on names 			*/
-    H5_INDEX_CRT_ORDER,		/* Index on creation order 		*/
-    H5_INDEX_N			/* Number of indices defined 		*/
+    H5_INDEX_UNKNOWN = -1,    /* Unknown index type            */
+    H5_INDEX_NAME,        /* Index on names             */
+    H5_INDEX_CRT_ORDER,        /* Index on creation order         */
+    H5_INDEX_N            /* Number of indices defined         */
 } H5_index_t;
 
 /*
@@ -403,9 +365,9 @@ H5_DLL herr_t H5get_free_list_sizes(size_t *reg_size, size_t *arr_size,
     size_t *blk_size, size_t *fac_size);
 H5_DLL herr_t H5get_alloc_stats(H5_alloc_stats_t *stats);
 H5_DLL herr_t H5get_libversion(unsigned *majnum, unsigned *minnum,
-				unsigned *relnum);
+                unsigned *relnum);
 H5_DLL herr_t H5check_version(unsigned majnum, unsigned minnum,
-			       unsigned relnum);
+                unsigned relnum);
 H5_DLL herr_t H5is_library_threadsafe(hbool_t *is_ts);
 H5_DLL herr_t H5free_memory(void *mem);
 H5_DLL void *H5allocate_memory(size_t size, hbool_t clear);
diff --git a/src/H5win32defs.h b/src/H5win32defs.h
index 00df56d..71162eb 100644
--- a/src/H5win32defs.h
+++ b/src/H5win32defs.h
@@ -20,6 +20,45 @@
  *          inside H5private.h
  *
  */
+#ifndef H5_HAVE_INTTYPES_H
+/* The following definitions should be suitable for 64-bit Windows, which is
+ * LLP64, and for 32-bit Windows, which is ILP32.  Those are the only
+ * platforms where <inttypes.h> is likely to be missing.  VS2015 and later
+ * *may* provide these definitions.
+ */
+#ifdef _WIN64
+#       define PRIdPTR "lld"
+#       define PRIoPTR "llo"
+#       define PRIuPTR "llu"
+#       define PRIxPTR "llx"
+#else /* _WIN64 */
+#       define PRIdPTR "ld"
+#       define PRIoPTR "lo"
+#       define PRIuPTR "lu"
+#       define PRIxPTR "lx"
+#endif /* _WIN64 */
+
+#   define PRId8 "d"
+#   define PRIo8 "o"
+#   define PRIu8 "u"
+#   define PRIx8 "x"
+#   define PRId16 "d"
+#   define PRIo16 "o"
+#   define PRIu16 "u"
+#   define PRIx16 "x"
+#   define PRId32 "d"
+#   define PRIo32 "o"
+#   define PRIu32 "u"
+#   define PRIx32 "x"
+#   define PRId64 "lld"
+#   define PRIo64 "llo"
+#   define PRIu64 "llu"
+#   define PRIx64 "llx"
+#   define PRIdMAX "lld"
+#   define PRIoMAX "llo"
+#   define PRIuMAX "llu"
+#   define PRIxMAX "llx"
+#endif
 
 /*
  * _MSC_VER = 1900 VS2015
@@ -41,11 +80,6 @@ typedef __int64             h5_stat_size_t;
 #define HDfstat(F,B)        _fstati64(F,B)
 #define HDisatty(F)         _isatty(F)
 
-/* The isnan function needs underscore in VS2012 and earlier */
-#if (_MSC_VER <= 1700)
-  #define HDisnan(X)      _isnan(X)
-#endif /* MSC_VER < 1700 */
-
 #define HDgetcwd(S,Z)       _getcwd(S,Z)
 #define HDgetdcwd(D,S,Z)    _getdcwd(D,S,Z)
 #define HDgetdrive()        _getdrive()
@@ -111,8 +145,10 @@ struct timespec
 };
 #endif /* MSC_VER < 1900 */
 
-/* The round functions do not exist in VS2012 and earlier */
 #if (_MSC_VER <= 1700)
+/* The isnan function needs underscore in VS2012 and earlier */
+#define HDisnan(X)         _isnan(X)
+/* The round functions do not exist in VS2012 and earlier */
 #define HDllround(V)        Wllround(V)
 #define HDllroundf(V)       Wllroundf(V)
 #define HDlround(V)         Wlround(V)