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 /perform | |
| 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 'perform')
| -rw-r--r-- | perform/iopipe.c | 2 | ||||
| -rw-r--r-- | perform/pio_standalone.h | 12 | ||||
| -rw-r--r-- | perform/zip_perf.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/perform/iopipe.c b/perform/iopipe.c index b852196..8728fab 100644 --- a/perform/iopipe.c +++ b/perform/iopipe.c @@ -148,7 +148,7 @@ static void synchronize (void) { #ifdef H5_HAVE_SYSTEM -#if defined(WIN32) && ! defined(__CYGWIN__) +#if defined(_WIN32) && ! defined(__CYGWIN__) _flushall(); #else HDsystem ("sync"); diff --git a/perform/pio_standalone.h b/perform/pio_standalone.h index 7b28e93..ec18fea 100644 --- a/perform/pio_standalone.h +++ b/perform/pio_standalone.h @@ -47,9 +47,9 @@ * And now for a couple non-Posix functions... Watch out for systems that * define these in terms of macros. */ -#ifdef WIN32 +#ifdef _WIN32 #define HDstrdup(S) _strdup(S) -#else /* WIN32 */ +#else /* _WIN32 */ #if !defined strdup && !defined H5_HAVE_STRDUP extern char *strdup(const char *s); @@ -57,7 +57,7 @@ extern char *strdup(const char *s); #define HDstrdup(S) strdup(S) -#endif /* WIN32 */ +#endif /* _WIN32 */ #define HDstrcmp(S,T) strcmp(S,T) #define HDstrlen(S) strlen(S) @@ -74,7 +74,7 @@ extern char *strdup(const char *s); #endif #define HDclose(F) close(F) -#ifdef WIN32 +#ifdef _WIN32 #ifdef __MWERKS__ #define HDlseek(F,O,W) lseek(F,O,W) #else /*MSVS */ @@ -95,7 +95,7 @@ extern char *strdup(const char *s); #define HDread(F,M,Z) read(F,M,Z) -#ifdef WIN32 +#ifdef _WIN32 #ifdef __MWERKS__ #define HDstat(S,B) stat(S,B) #else /*MSVC*/ @@ -105,7 +105,7 @@ extern char *strdup(const char *s); #define HDstat(S,B) stat(S,B) #endif -#ifdef WIN32 +#ifdef _WIN32 #ifdef __MWERKS__ #define HDfstat(F,B) fstat(F,B) typedef struct stat h5_stat_t; diff --git a/perform/zip_perf.c b/perform/zip_perf.c index ad760ed..f5be6a0 100644 --- a/perform/zip_perf.c +++ b/perform/zip_perf.c @@ -43,13 +43,13 @@ #include <zlib.h> -#if defined(MSDOS) || defined(OS2) || defined(WIN32) +#if defined(MSDOS) || defined(OS2) || defined(_WIN32) # include <fcntl.h> # include <io.h> # define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY) #else # define SET_BINARY_MODE(file) /* nothing */ -#endif /* MSDOS || OS2 || WIN32 */ +#endif /* MSDOS || OS2 || _WIN32 */ #ifdef VMS # define unlink delete |