[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, 53 insertions, 53 deletions

diff --git a/test/flush2.c b/test/flush2.c
index 5675856..da41415 100644
--- a/test/flush2.c
+++ b/test/flush2.c
@@ -17,10 +17,10 @@
  * Programmer:  Robb Matzke <matzke@llnl.gov>
  *              Friday, October 23, 1998
  *
- * Purpose:	This is the second half of a two-part test that makes sure
- *		that a file can be read after an application crashes as long
- *		as the file was flushed first.  This half tries to read the
- *		file created by the first half.
+ * Purpose:  This is the second half of a two-part test that makes sure
+ *    that a file can be read after an application crashes as long
+ *    as the file was flushed first.  This half tries to read the
+ *    file created by the first half.
  */
 #include "h5test.h"
 
@@ -31,19 +31,19 @@ const char *FILENAME[] = {
     NULL
 };
 
-static double	the_data[100][100];
+static double  the_data[100][100];
 
 /*-------------------------------------------------------------------------
- * Function:	check_dset
+ * Function:  check_dset
  *
- * Purpose:	Part 2 of a two-part H5Fflush() test, checks if the data in a dataset
- * 		is what it is supposed to be.
+ * Purpose:  Part 2 of a two-part H5Fflush() test, checks if the data in a dataset
+ *     is what it is supposed to be.
  *
- * Return:	Success:	0
+ * Return:  Success:  0
  *
- *		Failure:	1
+ *    Failure:  1
  *
- * Programmer:	Leon Arber
+ * Programmer:  Leon Arber
  *              Oct. 4, 2006.
  *
  *-------------------------------------------------------------------------
@@ -51,10 +51,10 @@ static double	the_data[100][100];
 static int
 check_dset(hid_t file, const char* name)
 {
-    hid_t	space, dset;
-    hsize_t	ds_size[2] = {100, 100};
-    double	error;
-    size_t	i, j;
+    hid_t  space, dset;
+    hsize_t  ds_size[2] = {100, 100};
+    double  error;
+    size_t  i, j;
 
     /* Open the dataset */
     if((dset = H5Dopen2(file, name, H5P_DEFAULT)) < 0) goto error;
@@ -64,24 +64,24 @@ check_dset(hid_t file, const char* name)
 
     /* Read some data */
     if(H5Dread(dset, H5T_NATIVE_DOUBLE, space, space, H5P_DEFAULT,
-		the_data) < 0) goto error;
+    the_data) < 0) goto error;
     for(i = 0; i < (size_t)ds_size[0]; i++)
-	for(j = 0; j < (size_t)ds_size[1]; j++) {
-	    /*
-	     * The extra cast in the following statement is a bug workaround
-	     * for the Win32 version 5.0 compiler.
-	     * 1998-11-06 ptl
-	     */
-	    error = fabs(the_data[i][j] - (double)(hssize_t)i / ((hssize_t)j + 1));
-	    if(error > 0.0001) {
-		H5_FAILED();
-		printf("    dset[%lu][%lu] = %g\n",
-			(unsigned long)i, (unsigned long)j, the_data[i][j]);
-		printf("    should be %g\n",
-			(double)(hssize_t)i/(hssize_t)(j+1));
-		goto error;
-	    }
-	}
+  for(j = 0; j < (size_t)ds_size[1]; j++) {
+      /*
+       * The extra cast in the following statement is a bug workaround
+       * for the Win32 version 5.0 compiler.
+       * 1998-11-06 ptl
+       */
+      error = fabs(the_data[i][j] - (double)(hssize_t)i / ((hssize_t)j + 1));
+      if(error > 0.0001) {
+    H5_FAILED();
+    printf("    dset[%lu][%lu] = %g\n",
+      (unsigned long)i, (unsigned long)j, the_data[i][j]);
+    printf("    should be %g\n",
+      (double)(hssize_t)i/(hssize_t)(j+1));
+    goto error;
+      }
+  }
     if(H5Dclose(dset) < 0) goto error;
     return 0;
 
@@ -91,15 +91,15 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * Function:	check_file
+ * Function:  check_file
  *
- * Purpose:	Part 2 of a two-part H5Fflush() test.
+ * Purpose:  Part 2 of a two-part H5Fflush() test.
  *
- * Return:	Success:	0
+ * Return:  Success:  0
  *
- *		Failure:	1
+ *    Failure:  1
  *
- * Programmer:	Leon Arber
+ * Programmer:  Leon Arber
  *              Sept. 26, 2006.
  *
  *-------------------------------------------------------------------------
@@ -107,9 +107,9 @@ error:
 static int
 check_file(char* filename, hid_t fapl, int flag)
 {
-    hid_t	file, groups, grp;
-    char	name[1024];
-    int		i;
+    hid_t  file, groups, grp;
+    char  name[1024];
+    int    i;
 
     if((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) goto error;
     if(check_dset(file, "dset")) goto error;
@@ -117,9 +117,9 @@ check_file(char* filename, hid_t fapl, int flag)
     /* Open some groups */
     if((groups = H5Gopen2(file, "some_groups", H5P_DEFAULT)) < 0) goto error;
     for(i = 0; i < 100; i++) {
-	sprintf(name, "grp%02u", (unsigned)i);
-	if((grp = H5Gopen2(groups, name, H5P_DEFAULT)) < 0) goto error;
-	if(H5Gclose(grp) < 0) goto error;
+  sprintf(name, "grp%02u", (unsigned)i);
+  if((grp = H5Gopen2(groups, name, H5P_DEFAULT)) < 0) goto error;
+  if(H5Gclose(grp) < 0) goto error;
     } /* end for */
 
     /* Check to see if that last added dataset in the third file is accessible
@@ -137,20 +137,20 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:  main
  *
- * Purpose:	Part 2 of a two-part H5Fflush() test.
+ * Purpose:  Part 2 of a two-part H5Fflush() test.
  *
- * Return:	Success:	0
+ * Return:  Success:  0
  *
- *		Failure:	1
+ *    Failure:  1
  *
- * Programmer:	Robb Matzke
+ * Programmer:  Robb Matzke
  *              Friday, October 23, 1998
  *
  * Modifications:
- * 		Leon Arber
- * 		Sept. 26, 2006, expand to check for case where the was file not flushed.
+ *     Leon Arber
+ *     Sept. 26, 2006, expand to check for case where the was file not flushed.
  *
  *-------------------------------------------------------------------------
  */
@@ -159,7 +159,7 @@ main(void)
 {
     hid_t fapl;
     H5E_auto2_t func;
-    char	name[1024];
+    char  name[1024];
 
     h5_reset();
     fapl = h5_fileaccess();
@@ -186,7 +186,7 @@ main(void)
         PASSED()
     else
     {
-#if defined _WIN32 && defined _HDF5USEDLL_
+#if defined H5_HAVE_WIN32_API && defined _HDF5USEDLL_
     SKIPPED();
     puts("   DLL will flush the file even when calling _exit, skip this test temporarily");
 #elif defined H5_VMS
@@ -209,7 +209,7 @@ main(void)
         PASSED()
     else
     {
-#if defined _WIN32 && defined _HDF5USEDLL_
+#if defined H5_HAVE_WIN32_API && defined _HDF5USEDLL_
     SKIPPED();
     puts("   DLL will flush the file even when calling _exit, skip this test temporarily");
 #elif defined H5_VMS