diff options
| author | Scott Wegner <swegner@hdfgroup.org> | 2007-05-18 15:14:43 (GMT) |
|---|---|---|
| committer | Scott Wegner <swegner@hdfgroup.org> | 2007-05-18 15:14:43 (GMT) |
| commit | 87a41d4286718ebc06acf6a9021ea85b9a93f278 (patch) | |
| tree | 1e1946e375f700573b5718020a16c7e117f33c76 /tools/h5import/h5importtest.c | |
| parent | 513c74a8da0e7bb29b727ddc1409e7e6d7902461 (diff) | |
| download | hdf5-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/h5importtest.c')
| -rwxr-xr-x | tools/h5import/h5importtest.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/h5import/h5importtest.c b/tools/h5import/h5importtest.c index 847f216..d9f5df2 100755 --- a/tools/h5import/h5importtest.c +++ b/tools/h5import/h5importtest.c @@ -46,7 +46,7 @@ main(void) int rowo4i = (int)11 , colo4i = (int)21 , plno4i = (int)51 ; int rowi4i = (int)1 , coli4i = (int)2 , plni4i = (int)5 ; -#ifndef WIN32 +#ifndef _WIN32 long_long b64i2[3][4], b64i3[5][3][4]; long_long row4i64[3], col4i64[4], pln4i64[5]; long_long rowo4i64 = (long_long)11 , colo4i64 = (long_long)21 , plno4i64 = (long_long)51 ; @@ -96,7 +96,7 @@ main(void) col4i[0] = colo4i; pln4i[0] = plno4i; -#ifndef WIN32 +#ifndef _WIN32 row4i64[0] = rowo4i64; col4i64[0] = colo4i64; pln4i64[0] = plno4i64; @@ -115,7 +115,7 @@ main(void) row4[i] = row4[i - 1] + rowi4; row8[i] = row8[i - 1] + rowi8; row4i[i] = row4i[i - 1] + rowi4i; -#ifndef WIN32 +#ifndef _WIN32 row4i64[i] = row4i64[i - 1] + rowi4i64; #endif row4i16[i] = row4i16[i - 1] + rowi4i16; @@ -127,7 +127,7 @@ main(void) col4[j] = col4[j - 1] + coli4; col8[j] = col8[j - 1] + coli8; col4i[j] = col4i[j - 1] + coli4i; -#ifndef WIN32 +#ifndef _WIN32 col4i64[j] = col4i64[j - 1] + coli4i64; #endif col4i16[j] = col4i16[j - 1] + coli4i16; @@ -138,7 +138,7 @@ main(void) pln4[k] = pln4[k - 1] + plni4; pln8[k] = pln8[k - 1] + plni8; pln4i[k] = pln4i[k - 1] + plni4i; -#ifndef WIN32 +#ifndef _WIN32 pln4i64[k] = pln4i64[k - 1] + plni4i64; #endif pln4i16[k] = pln4i16[k - 1] + plni4i16; @@ -149,7 +149,7 @@ main(void) { for (j = 0; j < ncol; j++) { -#ifndef WIN32 +#ifndef _WIN32 b64i2[i][j] = row4i64[i] + col4i64[j]; #endif } @@ -170,7 +170,7 @@ main(void) b32r3[k][i][j] = row4[i] + col4[j] + pln4[k]; b64r3[k][i][j] = row8[i] + col8[j] + pln8[k]; b32i3[k][i][j] = row4i[i] + col4i[j] + pln4i[k]; -#ifndef WIN32 +#ifndef _WIN32 b64i3[k][i][j] = row4i64[i] + col4i64[j] + pln4i64[k]; #endif b16i3[k][i][j] = row4i16[i] + col4i16[j] + pln4i16[k]; @@ -221,7 +221,7 @@ main(void) (void) fwrite((char *) &b32i3[k][i][j], sizeof(unsigned int), 1, sp); (void) fclose(sp); -#ifndef WIN32 +#ifndef _WIN32 sp = fopen("bin64-2", "w"); for (i = 0; i < nrow; i++) @@ -254,7 +254,7 @@ main(void) sp); (void) fclose(sp); -#ifndef WIN32 +#ifndef _WIN32 sp = fopen("bin64-3", "w"); for (k = 0; k < npln; k++) |