summaryrefslogtreecommitdiffstats
path: root/tools/h5import/h5import.c
diff options
context:
space:
mode:
authorScott Wegner <swegner@hdfgroup.org>2007-05-18 15:14:43 (GMT)
committerScott Wegner <swegner@hdfgroup.org>2007-05-18 15:14:43 (GMT)
commit87a41d4286718ebc06acf6a9021ea85b9a93f278 (patch)
tree1e1946e375f700573b5718020a16c7e117f33c76 /tools/h5import/h5import.c
parent513c74a8da0e7bb29b727ddc1409e7e6d7902461 (diff)
downloadhdf5-87a41d4286718ebc06acf6a9021ea85b9a93f278.zip
hdf5-87a41d4286718ebc06acf6a9021ea85b9a93f278.tar.gz
hdf5-87a41d4286718ebc06acf6a9021ea85b9a93f278.tar.bz2
[svn-r13766] In Visual Studio 2005 for 64-bit, _WIN32 is defined, but not WIN32, so I've standardized all #ifdef's to use _WIN32. This should not affect any other platform.
Tested: Visual Studio (32- and 64-bit) on Win XP
Diffstat (limited to 'tools/h5import/h5import.c')
-rwxr-xr-xtools/h5import/h5import.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c
index 3903e37..bfa2c82 100755
--- a/tools/h5import/h5import.c
+++ b/tools/h5import/h5import.c
@@ -336,7 +336,7 @@ readIntegerData(FILE **strm, struct Input *in)
H5DT_INT8 *in08;
H5DT_INT16 *in16, temp;
H5DT_INT32 *in32;
-#ifndef WIN32
+#ifndef _WIN32
H5DT_INT64 *in64;
char buffer[256];
#endif
@@ -452,7 +452,7 @@ readIntegerData(FILE **strm, struct Input *in)
}
break;
-#ifndef WIN32
+#ifndef _WIN32
case 64:
in64 = (H5DT_INT64 *) in->data;
switch(in->inputClass)
@@ -485,7 +485,7 @@ readIntegerData(FILE **strm, struct Input *in)
return (-1);
}
break;
-#endif /* ifndef WIN32 */
+#endif /* ifndef _WIN32 */
default:
(void) fprintf(stderr, err3);
@@ -500,7 +500,7 @@ readUIntegerData(FILE **strm, struct Input *in)
H5DT_UINT8 *in08;
H5DT_UINT16 *in16, temp;
H5DT_UINT32 *in32;
-#ifndef WIN32
+#ifndef _WIN32
H5DT_UINT64 *in64;
char buffer[256];
#endif
@@ -614,7 +614,7 @@ readUIntegerData(FILE **strm, struct Input *in)
}
break;
-#ifndef WIN32
+#ifndef _WIN32
case 64:
in64 = (H5DT_UINT64 *) in->data;
switch(in->inputClass)
@@ -647,7 +647,7 @@ readUIntegerData(FILE **strm, struct Input *in)
return (-1);
}
break;
-#endif /* ifndef WIN32 */
+#endif /* ifndef _WIN32 */
default:
(void) fprintf(stderr, err3);
@@ -1254,7 +1254,7 @@ validateConfigurationParameters(struct Input * in)
const char *err4a = "OUTPUT-ARCHITECTURE cannot be STD if OUTPUT-CLASS is floating point (FP).\n";
const char *err4b = "OUTPUT-ARCHITECTURE cannot be IEEE if OUTPUT-CLASS is integer (IN).\n";
const char *err5 = "For OUTPUT-CLASS FP, valid values for OUTPUT-SIZE are (32, 64) .\n";
-#ifdef WIN32
+#ifdef _WIN32
const char *err6 = "No support for reading 64-bit integer (INPUT-CLASS: IN, TEXTIN, UIN, TEXTUIN files\n";
#endif
@@ -1311,7 +1311,7 @@ validateConfigurationParameters(struct Input * in)
return (-1);
}
-#ifdef WIN32
+#ifdef _WIN32
if (in->inputSize == 64 && (in->inputClass == 0 || in->inputClass == 4 || in->inputClass == 6 || in->inputClass == 7) )
{
(void) fprintf(stderr, err6);