[svn-r21376] JIRA-HDFFV-2748: Relplace WIN32 macros in source. New H5_HAVE_WIN32_API and H5_HAVE_VISUAL_STUDIO defines only need to be set on windows. Autotools configure is not affected.

Trunk passed for a week and cmake branch has been in place > 3 weeks.

Tested: local linux

1 files changed, 184 insertions, 184 deletions

diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c
index 5b9b22b..14598d2 100644
--- a/src/H5FDsec2.c
+++ b/src/H5FDsec2.c
@@ -17,27 +17,27 @@
  * Programmer:  Robb Matzke <matzke@llnl.gov>
  *              Thursday, July 29, 1999
  *
- * Purpose:	The POSIX unbuffered file driver using only the HDF5 public
- *		API and with a few optimizations: the lseek() call is made
- *		only when the current file position is unknown or needs to be
- *		changed based on previous I/O through this driver (don't mix
- *		I/O from this driver with I/O from other parts of the
- *		application to the same file).
+ * Purpose:  The POSIX unbuffered file driver using only the HDF5 public
+ *    API and with a few optimizations: the lseek() call is made
+ *    only when the current file position is unknown or needs to be
+ *    changed based on previous I/O through this driver (don't mix
+ *    I/O from this driver with I/O from other parts of the
+ *    application to the same file).
  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5FD_sec2_init_interface
+#define H5_INTERFACE_INIT_FUNC  H5FD_sec2_init_interface
 
 
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* File access				*/
-#include "H5FDprivate.h"	/* File drivers				*/
-#include "H5FDsec2.h"		/* Sec2 file driver			*/
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Pprivate.h"		/* Property lists			*/
+#include "H5private.h"    /* Generic Functions      */
+#include "H5Eprivate.h"    /* Error handling        */
+#include "H5Fprivate.h"    /* File access        */
+#include "H5FDprivate.h"  /* File drivers        */
+#include "H5FDsec2.h"    /* Sec2 file driver      */
+#include "H5FLprivate.h"  /* Free Lists                           */
+#include "H5Iprivate.h"    /* IDs            */
+#include "H5MMprivate.h"  /* Memory management      */
+#include "H5Pprivate.h"    /* Property lists      */
 
 /* The driver identification number, initialized at runtime */
 static hid_t H5FD_SEC2_g = 0;
@@ -55,27 +55,27 @@ static hid_t H5FD_SEC2_g = 0;
  * occurs), and `op' will be set to H5F_OP_UNKNOWN.
  */
 typedef struct H5FD_sec2_t {
-    H5FD_t	pub;			/*public stuff, must be first	*/
-    int		fd;			/*the unix file			*/
-    haddr_t	eoa;			/*end of allocated region	*/
-    haddr_t	eof;			/*end of file; current file size*/
-    haddr_t	pos;			/*current file I/O position	*/
-    H5FD_file_op_t	op;		/*last operation		*/
-    char	filename[H5FD_MAX_FILENAME_LEN];     /* Copy of file name from open operation */
-#ifndef _WIN32
+    H5FD_t  pub;      /*public stuff, must be first  */
+    int    fd;      /*the unix file      */
+    haddr_t  eoa;      /*end of allocated region  */
+    haddr_t  eof;      /*end of file; current file size*/
+    haddr_t  pos;      /*current file I/O position  */
+    H5FD_file_op_t  op;    /*last operation    */
+    char  filename[H5FD_MAX_FILENAME_LEN];     /* Copy of file name from open operation */
+#ifndef H5_HAVE_WIN32_API
     /*
      * On most systems the combination of device and i-node number uniquely
      * identify a file.
      */
-    dev_t	device;			/*file device number		*/
+    dev_t  device;      /*file device number    */
 #ifdef H5_VMS
-    ino_t	inode[3];		/*file i-node number		*/
+    ino_t  inode[3];    /*file i-node number    */
 #else
-    ino_t	inode;			/*file i-node number		*/
+    ino_t  inode;      /*file i-node number    */
 #endif /*H5_VMS*/
 #else
     /*
-     * On _WIN32 the low-order word of a unique identifier associated with the
+     * On H5_HAVE_WIN32_API the low-order word of a unique identifier associated with the
      * file and the volume serial number uniquely identify a file. This number
      * (which, both? -rpm) may change when the system is restarted or when the
      * file is opened. After a process opens a file, the identifier is
@@ -98,8 +98,8 @@ typedef struct H5FD_sec2_t {
  * some macros here so we don't have to have conditional compilations later
  * throughout the code.
  *
- * HDoff_t:	The datatype for file offsets, the second argument of
- *		the lseek() or lseek64() call.
+ * HDoff_t:  The datatype for file offsets, the second argument of
+ *    the lseek() or lseek64() call.
  *
  */
 
@@ -107,28 +107,28 @@ typedef struct H5FD_sec2_t {
  * These macros check for overflow of various quantities.  These macros
  * assume that HDoff_t is signed and haddr_t and size_t are unsigned.
  *
- * ADDR_OVERFLOW:	Checks whether a file address of type `haddr_t'
- *			is too large to be represented by the second argument
- *			of the file seek function.
+ * ADDR_OVERFLOW:  Checks whether a file address of type `haddr_t'
+ *      is too large to be represented by the second argument
+ *      of the file seek function.
  *
- * SIZE_OVERFLOW:	Checks whether a buffer size of type `hsize_t' is too
- *			large to be represented by the `size_t' type.
+ * SIZE_OVERFLOW:  Checks whether a buffer size of type `hsize_t' is too
+ *      large to be represented by the `size_t' type.
  *
- * REGION_OVERFLOW:	Checks whether an address and size pair describe data
- *			which can be addressed entirely by the second
- *			argument of the file seek function.
+ * REGION_OVERFLOW:  Checks whether an address and size pair describe data
+ *      which can be addressed entirely by the second
+ *      argument of the file seek function.
  */
 #define MAXADDR (((haddr_t)1<<(8*sizeof(HDoff_t)-1))-1)
-#define ADDR_OVERFLOW(A)	(HADDR_UNDEF==(A) ||			      \
-				 ((A) & ~(haddr_t)MAXADDR))
-#define SIZE_OVERFLOW(Z)	((Z) & ~(hsize_t)MAXADDR)
-#define REGION_OVERFLOW(A,Z)	(ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) ||      \
-                                 HADDR_UNDEF==(A)+(Z) ||		      \
-				 (HDoff_t)((A)+(Z))<(HDoff_t)(A))
+#define ADDR_OVERFLOW(A)  (HADDR_UNDEF==(A) ||            \
+         ((A) & ~(haddr_t)MAXADDR))
+#define SIZE_OVERFLOW(Z)  ((Z) & ~(hsize_t)MAXADDR)
+#define REGION_OVERFLOW(A,Z)  (ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) ||      \
+                                 HADDR_UNDEF==(A)+(Z) ||          \
+         (HDoff_t)((A)+(Z))<(HDoff_t)(A))
 
 /* Prototypes */
 static H5FD_t *H5FD_sec2_open(const char *name, unsigned flags, hid_t fapl_id,
-			      haddr_t maxaddr);
+            haddr_t maxaddr);
 static herr_t H5FD_sec2_close(H5FD_t *_file);
 static int H5FD_sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
 static herr_t H5FD_sec2_query(const H5FD_t *_f1, unsigned long *flags);
@@ -137,43 +137,43 @@ static herr_t H5FD_sec2_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
 static haddr_t H5FD_sec2_get_eof(const H5FD_t *_file);
 static herr_t  H5FD_sec2_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
 static herr_t H5FD_sec2_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
-			     size_t size, void *buf);
+           size_t size, void *buf);
 static herr_t H5FD_sec2_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
-			      size_t size, const void *buf);
+            size_t size, const void *buf);
 static herr_t H5FD_sec2_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
 
 static const H5FD_class_t H5FD_sec2_g = {
-    "sec2",					/*name			*/
-    MAXADDR,					/*maxaddr		*/
-    H5F_CLOSE_WEAK,				/* fc_degree		*/
-    NULL,					/*sb_size		*/
-    NULL,					/*sb_encode		*/
-    NULL,					/*sb_decode		*/
-    0, 						/*fapl_size		*/
-    NULL,					/*fapl_get		*/
-    NULL,					/*fapl_copy		*/
-    NULL, 					/*fapl_free		*/
-    0,						/*dxpl_size		*/
-    NULL,					/*dxpl_copy		*/
-    NULL,					/*dxpl_free		*/
-    H5FD_sec2_open,				/*open			*/
-    H5FD_sec2_close,				/*close			*/
-    H5FD_sec2_cmp,				/*cmp			*/
-    H5FD_sec2_query,				/*query			*/
-    NULL,					/*get_type_map		*/
-    NULL,					/*alloc			*/
-    NULL,					/*free			*/
-    H5FD_sec2_get_eoa,				/*get_eoa		*/
-    H5FD_sec2_set_eoa, 				/*set_eoa		*/
-    H5FD_sec2_get_eof,				/*get_eof		*/
+    "sec2",          /*name      */
+    MAXADDR,          /*maxaddr    */
+    H5F_CLOSE_WEAK,        /* fc_degree    */
+    NULL,          /*sb_size    */
+    NULL,          /*sb_encode    */
+    NULL,          /*sb_decode    */
+    0,             /*fapl_size    */
+    NULL,          /*fapl_get    */
+    NULL,          /*fapl_copy    */
+    NULL,           /*fapl_free    */
+    0,            /*dxpl_size    */
+    NULL,          /*dxpl_copy    */
+    NULL,          /*dxpl_free    */
+    H5FD_sec2_open,        /*open      */
+    H5FD_sec2_close,        /*close      */
+    H5FD_sec2_cmp,        /*cmp      */
+    H5FD_sec2_query,        /*query      */
+    NULL,          /*get_type_map    */
+    NULL,          /*alloc      */
+    NULL,          /*free      */
+    H5FD_sec2_get_eoa,        /*get_eoa    */
+    H5FD_sec2_set_eoa,         /*set_eoa    */
+    H5FD_sec2_get_eof,        /*get_eof    */
     H5FD_sec2_get_handle,                       /*get_handle            */
-    H5FD_sec2_read,				/*read			*/
-    H5FD_sec2_write,				/*write			*/
-    NULL,					/*flush			*/
-    H5FD_sec2_truncate,				/*truncate		*/
+    H5FD_sec2_read,        /*read      */
+    H5FD_sec2_write,        /*write      */
+    NULL,          /*flush      */
+    H5FD_sec2_truncate,        /*truncate    */
     NULL,                                       /*lock                  */
     NULL,                                       /*unlock                */
-    H5FD_FLMAP_SINGLE 				/*fl_map		*/
+    H5FD_FLMAP_SINGLE         /*fl_map    */
 };
 
 /* Declare a free list to manage the H5FD_sec2_t struct */
@@ -203,15 +203,15 @@ H5FD_sec2_init_interface(void)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_sec2_init
+ * Function:  H5FD_sec2_init
  *
- * Purpose:	Initialize this driver by registering the driver with the
- *		library.
+ * Purpose:  Initialize this driver by registering the driver with the
+ *    library.
  *
- * Return:	Success:	The driver ID for the sec2 driver.
- *		Failure:	Negative.
+ * Return:  Success:  The driver ID for the sec2 driver.
+ *    Failure:  Negative.
  *
- * Programmer:	Robb Matzke
+ * Programmer:  Robb Matzke
  *              Thursday, July 29, 1999
  *
  *-------------------------------------------------------------------------
@@ -235,11 +235,11 @@ done:
 
 
 /*---------------------------------------------------------------------------
- * Function:	H5FD_sec2_term
+ * Function:  H5FD_sec2_term
  *
- * Purpose:	Shut down the VFD
+ * Purpose:  Shut down the VFD
  *
- * Return:	<none>
+ * Return:  <none>
  *
  * Programmer:  Quincey Koziol
  *              Friday, Jan 30, 2004
@@ -259,16 +259,16 @@ H5FD_sec2_term(void)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Pset_fapl_sec2
+ * Function:  H5Pset_fapl_sec2
  *
- * Purpose:	Modify the file access property list to use the H5FD_SEC2
- *		driver defined in this source file.  There are no driver
- *		specific properties.
+ * Purpose:  Modify the file access property list to use the H5FD_SEC2
+ *    driver defined in this source file.  There are no driver
+ *    specific properties.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:  Non-negative on success/Negative on failure
  *
- * Programmer:	Robb Matzke
- *		Thursday, February 19, 1998
+ * Programmer:  Robb Matzke
+ *    Thursday, February 19, 1998
  *
  *-------------------------------------------------------------------------
  */
@@ -292,16 +292,16 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_sec2_open
+ * Function:  H5FD_sec2_open
  *
- * Purpose:	Create and/or opens a Unix file as an HDF5 file.
+ * Purpose:  Create and/or opens a Unix file as an HDF5 file.
  *
- * Return:	Success:	A pointer to a new file data structure. The
- *				public fields will be initialized by the
- *				caller, which is always H5FD_open().
- *		Failure:	NULL
+ * Return:  Success:  A pointer to a new file data structure. The
+ *        public fields will be initialized by the
+ *        caller, which is always H5FD_open().
+ *    Failure:  NULL
  *
- * Programmer:	Robb Matzke
+ * Programmer:  Robb Matzke
  *              Thursday, July 29, 1999
  *
  *-------------------------------------------------------------------------
@@ -309,15 +309,15 @@ done:
 static H5FD_t *
 H5FD_sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
 {
-    H5FD_sec2_t	*file = NULL;   /* sec2 VFD info */
-    int		fd = (-1);      /* File descriptor */
-    int		o_flags;        /* Flags for open() call */
-#ifdef _WIN32
+    H5FD_sec2_t  *file = NULL;   /* sec2 VFD info */
+    int    fd = (-1);      /* File descriptor */
+    int    o_flags;        /* Flags for open() call */
+#ifdef H5_HAVE_WIN32_API
     HFILE filehandle;
     struct _BY_HANDLE_FILE_INFORMATION fileinfo;
 #endif
-    h5_stat_t	sb;
-    H5FD_t	*ret_value;     /* Return value */
+    h5_stat_t  sb;
+    H5FD_t  *ret_value;     /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT(H5FD_sec2_open)
 
@@ -358,12 +358,12 @@ H5FD_sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
     H5_ASSIGN_OVERFLOW(file->eof, sb.st_size, h5_stat_size_t, haddr_t);
     file->pos = HADDR_UNDEF;
     file->op = OP_UNKNOWN;
-#ifdef _WIN32
+#ifdef H5_HAVE_WIN32_API
     filehandle = _get_osfhandle(fd);
     (void)GetFileInformationByHandle((HANDLE)filehandle, &fileinfo);
     file->fileindexhi = fileinfo.nFileIndexHigh;
     file->fileindexlo = fileinfo.nFileIndexLow;
-#else /* _WIN32 */
+#else /* H5_HAVE_WIN32_API */
     file->device = sb.st_dev;
 #ifdef H5_VMS
     file->inode[0] = sb.st_ino[0];
@@ -373,7 +373,7 @@ H5FD_sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
     file->inode = sb.st_ino;
 #endif /*H5_VMS*/
 
-#endif /* _WIN32 */
+#endif /* H5_HAVE_WIN32_API */
 
     /* Retain a copy of the name used to open the file, for possible error reporting */
     HDstrncpy(file->filename, name, sizeof(file->filename));
@@ -413,14 +413,14 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_sec2_close
+ * Function:  H5FD_sec2_close
  *
- * Purpose:	Closes a Unix file.
+ * Purpose:  Closes a Unix file.
  *
- * Return:	Success:	0
- *		Failure:	-1, file not closed.
+ * Return:  Success:  0
+ *    Failure:  -1, file not closed.
  *
- * Programmer:	Robb Matzke
+ * Programmer:  Robb Matzke
  *              Thursday, July 29, 1999
  *
  *-------------------------------------------------------------------------
@@ -428,7 +428,7 @@ done:
 static herr_t
 H5FD_sec2_close(H5FD_t *_file)
 {
-    H5FD_sec2_t	*file = (H5FD_sec2_t *)_file;
+    H5FD_sec2_t  *file = (H5FD_sec2_t *)_file;
     herr_t ret_value = SUCCEED;                 /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT(H5FD_sec2_close)
@@ -449,16 +449,16 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_sec2_cmp
+ * Function:  H5FD_sec2_cmp
  *
- * Purpose:	Compares two files belonging to this driver using an
- *		arbitrary (but consistent) ordering.
+ * Purpose:  Compares two files belonging to this driver using an
+ *    arbitrary (but consistent) ordering.
  *
- * Return:	Success:	A value like strcmp()
- *		Failure:	never fails (arguments were checked by the
- *				caller).
+ * Return:  Success:  A value like strcmp()
+ *    Failure:  never fails (arguments were checked by the
+ *        caller).
  *
- * Programmer:	Robb Matzke
+ * Programmer:  Robb Matzke
  *              Thursday, July 29, 1999
  *
  *-------------------------------------------------------------------------
@@ -466,13 +466,13 @@ done:
 static int
 H5FD_sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
 {
-    const H5FD_sec2_t	*f1 = (const H5FD_sec2_t *)_f1;
-    const H5FD_sec2_t	*f2 = (const H5FD_sec2_t *)_f2;
+    const H5FD_sec2_t  *f1 = (const H5FD_sec2_t *)_f1;
+    const H5FD_sec2_t  *f2 = (const H5FD_sec2_t *)_f2;
     int ret_value = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_sec2_cmp)
 
-#ifdef _WIN32
+#ifdef H5_HAVE_WIN32_API
     if(f1->fileindexhi < f2->fileindexhi) HGOTO_DONE(-1)
     if(f1->fileindexhi > f2->fileindexhi) HGOTO_DONE(1)
 
@@ -508,15 +508,15 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_sec2_query
+ * Function:  H5FD_sec2_query
  *
- * Purpose:	Set the flags that this VFL driver is capable of supporting.
+ * Purpose:  Set the flags that this VFL driver is capable of supporting.
  *              (listed in H5FDpublic.h)
  *
- * Return:	Success:	non-negative
- *		Failure:	negative
+ * Return:  Success:  non-negative
+ *    Failure:  negative
  *
- * Programmer:	Quincey Koziol
+ * Programmer:  Quincey Koziol
  *              Friday, August 25, 2000
  *
  *-------------------------------------------------------------------------
@@ -524,7 +524,7 @@ done:
 static herr_t
 H5FD_sec2_query(const H5FD_t *_file, unsigned long *flags /* out */)
 {
-    const H5FD_sec2_t	*file = (const H5FD_sec2_t *)_file;    /* sec2 VFD info */
+    const H5FD_sec2_t  *file = (const H5FD_sec2_t *)_file;    /* sec2 VFD info */
 
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_sec2_query)
 
@@ -547,16 +547,16 @@ H5FD_sec2_query(const H5FD_t *_file, unsigned long *flags /* out */)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_sec2_get_eoa
+ * Function:  H5FD_sec2_get_eoa
  *
- * Purpose:	Gets the end-of-address marker for the file. The EOA marker
- *		is the first address past the last byte allocated in the
- *		format address space.
+ * Purpose:  Gets the end-of-address marker for the file. The EOA marker
+ *    is the first address past the last byte allocated in the
+ *    format address space.
  *
- * Return:	Success:	The end-of-address marker.
- *		Failure:	HADDR_UNDEF
+ * Return:  Success:  The end-of-address marker.
+ *    Failure:  HADDR_UNDEF
  *
- * Programmer:	Robb Matzke
+ * Programmer:  Robb Matzke
  *              Monday, August  2, 1999
  *
  *-------------------------------------------------------------------------
@@ -564,7 +564,7 @@ H5FD_sec2_query(const H5FD_t *_file, unsigned long *flags /* out */)
 static haddr_t
 H5FD_sec2_get_eoa(const H5FD_t *_file, H5FD_mem_t UNUSED type)
 {
-    const H5FD_sec2_t	*file = (const H5FD_sec2_t *)_file;
+    const H5FD_sec2_t  *file = (const H5FD_sec2_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_sec2_get_eoa)
 
@@ -573,16 +573,16 @@ H5FD_sec2_get_eoa(const H5FD_t *_file, H5FD_mem_t UNUSED type)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_sec2_set_eoa
+ * Function:  H5FD_sec2_set_eoa
  *
- * Purpose:	Set the end-of-address marker for the file. This function is
- *		called shortly after an existing HDF5 file is opened in order
- *		to tell the driver where the end of the HDF5 data is located.
+ * Purpose:  Set the end-of-address marker for the file. This function is
+ *    called shortly after an existing HDF5 file is opened in order
+ *    to tell the driver where the end of the HDF5 data is located.
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:  Success:  0
+ *    Failure:  -1
  *
- * Programmer:	Robb Matzke
+ * Programmer:  Robb Matzke
  *              Thursday, July 29, 1999
  *
  *-------------------------------------------------------------------------
@@ -590,7 +590,7 @@ H5FD_sec2_get_eoa(const H5FD_t *_file, H5FD_mem_t UNUSED type)
 static herr_t
 H5FD_sec2_set_eoa(H5FD_t *_file, H5FD_mem_t UNUSED type, haddr_t addr)
 {
-    H5FD_sec2_t	*file = (H5FD_sec2_t *)_file;
+    H5FD_sec2_t  *file = (H5FD_sec2_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_sec2_set_eoa)
 
@@ -601,18 +601,18 @@ H5FD_sec2_set_eoa(H5FD_t *_file, H5FD_mem_t UNUSED type, haddr_t addr)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_sec2_get_eof
+ * Function:  H5FD_sec2_get_eof
  *
- * Purpose:	Returns the end-of-file marker, which is the greater of
- *		either the Unix end-of-file or the HDF5 end-of-address
- *		markers.
+ * Purpose:  Returns the end-of-file marker, which is the greater of
+ *    either the Unix end-of-file or the HDF5 end-of-address
+ *    markers.
  *
- * Return:	Success:	End of file address, the first address past
- *				the end of the "file", either the Unix file
- *				or the HDF5 file.
- *		Failure:	HADDR_UNDEF
+ * Return:  Success:  End of file address, the first address past
+ *        the end of the "file", either the Unix file
+ *        or the HDF5 file.
+ *    Failure:  HADDR_UNDEF
  *
- * Programmer:	Robb Matzke
+ * Programmer:  Robb Matzke
  *              Thursday, July 29, 1999
  *
  *-------------------------------------------------------------------------
@@ -620,7 +620,7 @@ H5FD_sec2_set_eoa(H5FD_t *_file, H5FD_mem_t UNUSED type, haddr_t addr)
 static haddr_t
 H5FD_sec2_get_eof(const H5FD_t *_file)
 {
-    const H5FD_sec2_t	*file = (const H5FD_sec2_t *)_file;
+    const H5FD_sec2_t  *file = (const H5FD_sec2_t *)_file;
 
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_sec2_get_eof)
 
@@ -660,17 +660,17 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_sec2_read
+ * Function:  H5FD_sec2_read
  *
- * Purpose:	Reads SIZE bytes of data from FILE beginning at address ADDR
- *		into buffer BUF according to data transfer properties in
- *		DXPL_ID.
+ * Purpose:  Reads SIZE bytes of data from FILE beginning at address ADDR
+ *    into buffer BUF according to data transfer properties in
+ *    DXPL_ID.
  *
- * Return:	Success:	Zero. Result is stored in caller-supplied
- *				buffer BUF.
- *		Failure:	-1, Contents of buffer BUF are undefined.
+ * Return:  Success:  Zero. Result is stored in caller-supplied
+ *        buffer BUF.
+ *    Failure:  -1, Contents of buffer BUF are undefined.
  *
- * Programmer:	Robb Matzke
+ * Programmer:  Robb Matzke
  *              Thursday, July 29, 1999
  *
  *-------------------------------------------------------------------------
@@ -680,8 +680,8 @@ static herr_t
 H5FD_sec2_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id,
     haddr_t addr, size_t size, void *buf/*out*/)
 {
-    H5FD_sec2_t		*file = (H5FD_sec2_t *)_file;
-    ssize_t		nbytes;
+    H5FD_sec2_t    *file = (H5FD_sec2_t *)_file;
+    ssize_t    nbytes;
     herr_t              ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT(H5FD_sec2_read)
@@ -749,16 +749,16 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_sec2_write
+ * Function:  H5FD_sec2_write
  *
- * Purpose:	Writes SIZE bytes of data to FILE beginning at address ADDR
- *		from buffer BUF according to data transfer properties in
- *		DXPL_ID.
+ * Purpose:  Writes SIZE bytes of data to FILE beginning at address ADDR
+ *    from buffer BUF according to data transfer properties in
+ *    DXPL_ID.
  *
- * Return:	Success:	Zero
- *		Failure:	-1
+ * Return:  Success:  Zero
+ *    Failure:  -1
  *
- * Programmer:	Robb Matzke
+ * Programmer:  Robb Matzke
  *              Thursday, July 29, 1999
  *
  *-------------------------------------------------------------------------
@@ -766,10 +766,10 @@ done:
 /* ARGSUSED */
 static herr_t
 H5FD_sec2_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, haddr_t addr,
-		size_t size, const void *buf)
+    size_t size, const void *buf)
 {
-    H5FD_sec2_t		*file = (H5FD_sec2_t *)_file;
-    ssize_t		nbytes;
+    H5FD_sec2_t    *file = (H5FD_sec2_t *)_file;
+    ssize_t    nbytes;
     herr_t              ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT(H5FD_sec2_write)
@@ -833,15 +833,15 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_sec2_truncate
+ * Function:  H5FD_sec2_truncate
  *
- * Purpose:	Makes sure that the true file size is the same (or larger)
- *		than the end-of-address.
+ * Purpose:  Makes sure that the true file size is the same (or larger)
+ *    than the end-of-address.
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:  Success:  Non-negative
+ *    Failure:  Negative
  *
- * Programmer:	Robb Matzke
+ * Programmer:  Robb Matzke
  *              Wednesday, August  4, 1999
  *
  *-------------------------------------------------------------------------
@@ -859,7 +859,7 @@ H5FD_sec2_truncate(H5FD_t *_file, hid_t UNUSED dxpl_id, hbool_t UNUSED closing)
 
     /* Extend the file to make sure it's large enough */
     if(!H5F_addr_eq(file->eoa, file->eof)) {
-#ifdef _WIN32
+#ifdef H5_HAVE_WIN32_API
         HFILE filehandle;   /* Windows file handle */
         LARGE_INTEGER li;   /* 64-bit integer for SetFilePointer() call */
 
@@ -872,7 +872,7 @@ H5FD_sec2_truncate(H5FD_t *_file, hid_t UNUSED dxpl_id, hbool_t UNUSED closing)
         (void)SetFilePointer((HANDLE)filehandle, li.LowPart, &li.HighPart, FILE_BEGIN);
         if(SetEndOfFile((HANDLE)filehandle) == 0)
             HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
-#else /* _WIN32 */
+#else /* H5_HAVE_WIN32_API */
 #ifdef H5_VMS
         /* Reset seek offset to the beginning of the file, so that the file isn't
          * re-extended later.  This may happen on Open VMS. */
@@ -882,7 +882,7 @@ H5FD_sec2_truncate(H5FD_t *_file, hid_t UNUSED dxpl_id, hbool_t UNUSED closing)
 
         if(-1 == HDftruncate(file->fd, (HDoff_t)file->eoa))
             HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
-#endif /* _WIN32 */
+#endif /* H5_HAVE_WIN32_API */
 
         /* Update the eof value */
         file->eof = file->eoa;