From 87a41d4286718ebc06acf6a9021ea85b9a93f278 Mon Sep 17 00:00:00 2001 From: Scott Wegner Date: Fri, 18 May 2007 10:14:43 -0500 Subject: [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 --- c++/src/H5Exception.h | 2 +- examples/h5_elink_unix2win.c | 4 ++-- fortran/src/H5Pf.c | 4 ++-- hl/src/H5LTanalyze.c | 4 ++-- hl/tools/gif2h5/hdfgifwr.c | 2 +- perform/iopipe.c | 2 +- perform/pio_standalone.h | 12 ++++++------ perform/zip_perf.c | 4 ++-- src/H5Eint.c | 4 ++-- src/H5FDdirect.c | 20 ++++++++++---------- src/H5FDlog.c | 12 ++++++------ src/H5FDmpiposix.c | 24 ++++++++++++------------ src/H5FDsec2.c | 18 +++++++++--------- src/H5FDstdio.c | 24 ++++++++++++------------ src/H5FDstream.c | 4 ++-- src/H5Omtime.c | 6 +++--- src/H5api_adpt.h | 4 ++-- src/H5detect.c | 2 +- src/H5private.h | 42 +++++++++++++++++++++--------------------- test/flush2.c | 4 ++-- test/h5test.c | 12 ++++++------ test/tvlstr.c | 2 +- testpar/t_mdset.c | 6 +++--- testpar/testphdf5.c | 4 ++-- tools/h5dump/h5dumpgentest.c | 2 +- tools/h5import/h5import.c | 16 ++++++++-------- tools/h5import/h5importtest.c | 18 +++++++++--------- tools/h5jam/h5jamgentest.c | 6 +++--- tools/h5ls/h5ls.c | 2 +- tools/lib/h5tools_utils.c | 6 +++--- tools/misc/h5repart.c | 4 ++-- 31 files changed, 138 insertions(+), 138 deletions(-) diff --git a/c++/src/H5Exception.h b/c++/src/H5Exception.h index 902a2d7..d422edb 100644 --- a/c++/src/H5Exception.h +++ b/c++/src/H5Exception.h @@ -82,7 +82,7 @@ class H5_DLLCPP Exception { // Because 'string' is not instantiated at compilation time, this // warning is displayed when building DLL; but the class is exported // so the warning is harmless -#if defined(WIN32) +#if defined(_WIN32) #pragma warning(disable: 4251) #endif H5std_string detail_message; diff --git a/examples/h5_elink_unix2win.c b/examples/h5_elink_unix2win.c index abf7512..f9a7fca 100644 --- a/examples/h5_elink_unix2win.c +++ b/examples/h5_elink_unix2win.c @@ -142,7 +142,7 @@ unix2win_example(void) hid_t gid = (-1); /* Group ID */ /* Create the target file. */ -#ifdef WIN32 +#ifdef _WIN32 if((fid=H5Fcreate("u2w\\u2w_target.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT))<0) goto error; #else if((fid=H5Fcreate("u2w/u2w_target.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT))<0) goto error; @@ -161,7 +161,7 @@ unix2win_example(void) * that external links can be traversed. */ -#ifdef WIN32 +#ifdef _WIN32 /* Register the elink_unix2win class defined above to replace default * external links */ diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c index 7f0958d..c3bd709 100644 --- a/fortran/src/H5Pf.c +++ b/fortran/src/H5Pf.c @@ -3210,12 +3210,12 @@ HD5packFstring(tmp, _fcdtocp(memb_name), (size_t)(c_lenmax*H5FD_MEM_NTYPES)); for (i=0; i < H5FD_MEM_NTYPES; i++) { memb_map[i] = (int_f)c_memb_map[i]; memb_fapl[i] = (hid_t_f)c_memb_fapl[i]; -#if defined(WIN32) +#if defined(_WIN32) memb_addr[i] = -1; #else if(c_memb_addr[i] == HADDR_UNDEF) memb_addr[i] = -1; else memb_addr[i] = (real_f) ((long)c_memb_addr[i]/HADDR_MAX); -#endif /*WIN32*/ +#endif /*_WIN32*/ } *flag = (int_f)relax; *maxlen_out = (int_f)length; diff --git a/hl/src/H5LTanalyze.c b/hl/src/H5LTanalyze.c index b1bb29c..fd9c145 100644 --- a/hl/src/H5LTanalyze.c +++ b/hl/src/H5LTanalyze.c @@ -15,7 +15,7 @@ /* * This file was generated by Lex with the command "lex -oH5LTanalyze.c H5LTanalyze.l". - * Do NOT modify it by hand, but in line 33, "#ifndef WIN32" should be added because + * Do NOT modify it by hand, but in line 33, "#ifndef _WIN32" should be added because * Windows doesn't have unistd.h header file. */ @@ -31,7 +31,7 @@ #define YY_FLEX_MINOR_VERSION 5 #include -#ifndef WIN32 +#ifndef _WIN32 #include #endif diff --git a/hl/tools/gif2h5/hdfgifwr.c b/hl/tools/gif2h5/hdfgifwr.c index 66cf0d1..e6d681a 100644 --- a/hl/tools/gif2h5/hdfgifwr.c +++ b/hl/tools/gif2h5/hdfgifwr.c @@ -172,7 +172,7 @@ static unsigned long cur_accum = 0; static int cur_bits = 0; #define MAXCODE(n_bits) ( (1 << (n_bits)) - 1) -#ifndef WIN32 +#ifndef _WIN32 #define min(a,b) ((a>b) ? b : a) #endif #define XV_BITS 12 /* BITS was already defined on some systems */ 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 -#if defined(MSDOS) || defined(OS2) || defined(WIN32) +#if defined(MSDOS) || defined(OS2) || defined(_WIN32) # include # include # 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 diff --git a/src/H5Eint.c b/src/H5Eint.c index a3568d7..168cc4d 100644 --- a/src/H5Eint.c +++ b/src/H5Eint.c @@ -266,7 +266,7 @@ H5E_walk_cb(unsigned n, const H5E_error_t *err_desc, void *client_data) fprintf(stream, "thread 0"); } /* end block */ #elif defined(H5_HAVE_THREADSAFE) -#ifdef WIN32 +#ifdef _WIN32 fprintf(stream, "some thread: no way to know the thread number from pthread on windows"); #else fprintf(stream, "thread %lu", (unsigned long)pthread_self()); @@ -385,7 +385,7 @@ H5E_walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data) fprintf(stream, "thread 0"); } /* end block */ #elif defined(H5_HAVE_THREADSAFE) -#ifdef WIN32 +#ifdef _WIN32 fprintf(stream, "some thread: no way to know the thread number from pthread on windows"); #else fprintf(stream, "thread %lu", (unsigned long)pthread_self()); diff --git a/src/H5FDdirect.c b/src/H5FDdirect.c index 78db28e..23ff0fe 100644 --- a/src/H5FDdirect.c +++ b/src/H5FDdirect.c @@ -77,7 +77,7 @@ typedef struct H5FD_direct_t { haddr_t pos; /*current file I/O position */ int op; /*last operation */ H5FD_direct_fapl_t fa; /*file access properties */ -#ifndef WIN32 +#ifndef _WIN32 /* * On most systems the combination of device and i-node number uniquely * identify a file. @@ -90,7 +90,7 @@ typedef struct H5FD_direct_t { #endif /*H5_VMS*/ #else /* - * On WIN32 the low-order word of a unique identifier associated with the + * On _WIN32 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 @@ -120,7 +120,7 @@ typedef struct H5FD_direct_t { # define file_offset_t off64_t # define file_seek lseek64 # define file_truncate ftruncate64 -#elif defined (WIN32) && !defined(__MWERKS__) +#elif defined (_WIN32) && !defined(__MWERKS__) # /*MSVC*/ # define file_offset_t __int64 # define file_seek _lseeki64 @@ -491,7 +491,7 @@ H5FD_direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxadd int fd=(-1); H5FD_direct_t *file=NULL; H5FD_direct_fapl_t *fa; -#ifdef WIN32 +#ifdef _WIN32 HFILE filehandle; struct _BY_HANDLE_FILE_INFORMATION fileinfo; #endif @@ -542,7 +542,7 @@ H5FD_direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxadd 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 _WIN32 filehandle = _get_osfhandle(fd); (void)GetFileInformationByHandle((HANDLE)filehandle, &fileinfo); file->fileindexhi = fileinfo.nFileIndexHigh; @@ -556,7 +556,7 @@ H5FD_direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxadd #else file->inode = sb.st_ino; #endif /*H5_VMS*/ -#endif /*WIN32*/ +#endif /*_WIN32*/ file->fa.mboundary = fa->mboundary; file->fa.fbsize = fa->fbsize; file->fa.cbsize = fa->cbsize; @@ -668,7 +668,7 @@ H5FD_direct_cmp(const H5FD_t *_f1, const H5FD_t *_f2) FUNC_ENTER_NOAPI(H5FD_direct_cmp, H5FD_VFD_DEFAULT) -#ifdef WIN32 +#ifdef _WIN32 if (f1->fileindexhi < f2->fileindexhi) HGOTO_DONE(-1) if (f1->fileindexhi > f2->fileindexhi) HGOTO_DONE(1) @@ -1266,7 +1266,7 @@ H5FD_direct_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned UNUSED closing) /* Extend the file to make sure it's large enough */ if (file->eoa!=file->eof) { -#ifdef WIN32 +#ifdef _WIN32 HFILE filehandle; /* Windows file handle */ LARGE_INTEGER li; /* 64-bit integer for SetFilePointer() call */ @@ -1279,10 +1279,10 @@ H5FD_direct_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned 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 /* _WIN32 */ if (-1==file_truncate(file->fd, (file_offset_t)file->eoa)) HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly") -#endif /* WIN32 */ +#endif /* _WIN32 */ /* Update the eof value */ file->eof = file->eoa; diff --git a/src/H5FDlog.c b/src/H5FDlog.c index 4645003..5130c65 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -95,7 +95,7 @@ typedef struct H5FD_log_t { size_t iosize; /* Size of I/O information buffers */ FILE *logfp; /* Log file pointer */ H5FD_log_fapl_t fa; /*driver-specific file access properties*/ -#ifndef WIN32 +#ifndef _WIN32 /* * On most systems the combination of device and i-node number uniquely * identify a file. @@ -104,7 +104,7 @@ typedef struct H5FD_log_t { ino_t inode; /*file i-node number */ #else /* - * On WIN32 the low-order word of a unique identifier associated with the + * On _WIN32 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 @@ -134,7 +134,7 @@ typedef struct H5FD_log_t { #ifdef H5_HAVE_LSEEK64 # define file_offset_t off64_t # define file_seek lseek64 -#elif defined (WIN32) +#elif defined (_WIN32) # ifdef __MWERKS__ # define file_offset_t off_t # define file_seek lseek @@ -502,7 +502,7 @@ H5FD_log_open(const char *name, unsigned flags, hid_t fapl_id, int fd=(-1); H5FD_log_t *file=NULL; H5FD_log_fapl_t *fa; /* File access property list information */ -#ifdef WIN32 +#ifdef _WIN32 HFILE filehandle; struct _BY_HANDLE_FILE_INFORMATION fileinfo; #endif @@ -545,7 +545,7 @@ H5FD_log_open(const char *name, unsigned flags, hid_t fapl_id, 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 _WIN32 filehandle = _get_osfhandle(fd); (void)GetFileInformationByHandle((HANDLE)filehandle, &fileinfo); file->fileindexhi = fileinfo.nFileIndexHigh; @@ -746,7 +746,7 @@ H5FD_log_cmp(const H5FD_t *_f1, const H5FD_t *_f2) FUNC_ENTER_NOAPI(H5FD_log_cmp, H5FD_VFD_DEFAULT) -#ifdef WIN32 +#ifdef _WIN32 if (f1->fileindexhi < f2->fileindexhi) HGOTO_DONE(-1) if (f1->fileindexhi > f2->fileindexhi) HGOTO_DONE(1) diff --git a/src/H5FDmpiposix.c b/src/H5FDmpiposix.c index df39291..6c30065 100644 --- a/src/H5FDmpiposix.c +++ b/src/H5FDmpiposix.c @@ -99,7 +99,7 @@ typedef struct H5FD_mpiposix_t { size_t blksize; /* Block size of file system */ #endif hbool_t use_gpfs; /* Use GPFS to write things */ -#ifndef WIN32 +#ifndef _WIN32 /* * On most systems the combination of device and i-node number uniquely * identify a file. @@ -108,7 +108,7 @@ typedef struct H5FD_mpiposix_t { ino_t inode; /*file i-node number */ #else /* - * On WIN32 the low-order word of a unique identifier associated with the + * On _WIN32 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 @@ -138,7 +138,7 @@ typedef struct H5FD_mpiposix_t { # define file_offset_t off64_t # define file_seek lseek64 # define file_truncate ftruncate64 -#elif defined (WIN32) && !defined(__MWERKS__) +#elif defined (_WIN32) && !defined(__MWERKS__) # /*MSVC*/ # define file_offset_t __int64 # define file_seek _lseeki64 @@ -620,7 +620,7 @@ H5FD_mpiposix_open(const char *name, unsigned flags, hid_t fapl_id, H5FD_mpiposix_fapl_t _fa; /* Private copy of default file access property list information */ H5P_genplist_t *plist; /* Property list pointer */ h5_stat_t sb; /* Portable 'stat' struct */ -#ifdef WIN32 +#ifdef _WIN32 HFILE filehandle; struct _BY_HANDLE_FILE_INFORMATION fileinfo; int results; @@ -754,7 +754,7 @@ H5FD_mpiposix_open(const char *name, unsigned flags, hid_t fapl_id, file->fd = fd; file->eof = sb.st_size; - /* for WIN32 support. WIN32 'stat' does not have st_blksize and st_blksize + /* for _WIN32 support. _WIN32 'stat' does not have st_blksize and st_blksize is only used for the H5_HAVE_GPFS case */ #ifdef H5_HAVE_GPFS file->blksize = sb.st_blksize; @@ -773,7 +773,7 @@ H5FD_mpiposix_open(const char *name, unsigned flags, hid_t fapl_id, file->op = OP_UNKNOWN; /* Set the information for the file's device and inode */ -#ifdef WIN32 +#ifdef _WIN32 filehandle = _get_osfhandle(fd); results = GetFileInformationByHandle((HANDLE)filehandle, &fileinfo); file->fileindexhi = fileinfo.nFileIndexHigh; @@ -868,7 +868,7 @@ H5FD_mpiposix_cmp(const H5FD_t *_f1, const H5FD_t *_f2) FUNC_ENTER_NOAPI(H5FD_mpiposix_cmp, H5FD_VFD_DEFAULT) -#ifdef WIN32 +#ifdef _WIN32 if (f1->fileindexhi < f2->fileindexhi) HGOTO_DONE(-1) if (f1->fileindexhi > f2->fileindexhi) HGOTO_DONE(1) @@ -1383,10 +1383,10 @@ static herr_t H5FD_mpiposix_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned UNUSED closing) { H5FD_mpiposix_t *file = (H5FD_mpiposix_t*)_file; -#ifdef WIN32 +#ifdef _WIN32 HFILE filehandle; /* Windows file handle */ LARGE_INTEGER li; /* 64-bit integer for SetFilePointer() call */ -#endif /* WIN32 */ +#endif /* _WIN32 */ int mpi_code; /* MPI return code */ herr_t ret_value=SUCCEED; @@ -1399,7 +1399,7 @@ H5FD_mpiposix_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned UNUSED closing if(file->eoa>file->last_eoa) { /* Use the round-robin process to truncate (extend) the file */ if(file->mpi_rank == H5_PAR_META_WRITE) { -#ifdef WIN32 +#ifdef _WIN32 /* Map the posix file handle to a Windows file handle */ filehandle = _get_osfhandle(file->fd); @@ -1409,10 +1409,10 @@ H5FD_mpiposix_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned UNUSED closing 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 /* _WIN32 */ if(-1==file_truncate(file->fd, (file_offset_t)file->eoa)) HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly") -#endif /* WIN32 */ +#endif /* _WIN32 */ } /* end if */ /* Don't let any proc return until all have extended the file. diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c index e7de10c..b01ba3f 100644 --- a/src/H5FDsec2.c +++ b/src/H5FDsec2.c @@ -66,7 +66,7 @@ typedef struct H5FD_sec2_t { haddr_t eof; /*end of file; current file size*/ haddr_t pos; /*current file I/O position */ int op; /*last operation */ -#ifndef WIN32 +#ifndef _WIN32 /* * On most systems the combination of device and i-node number uniquely * identify a file. @@ -79,7 +79,7 @@ typedef struct H5FD_sec2_t { #endif /*H5_VMS*/ #else /* - * On WIN32 the low-order word of a unique identifier associated with the + * On _WIN32 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 @@ -110,7 +110,7 @@ typedef struct H5FD_sec2_t { # define file_offset_t off64_t # define file_seek lseek64 # define file_truncate ftruncate64 -#elif defined (WIN32) && !defined(__MWERKS__) +#elif defined (_WIN32) && !defined(__MWERKS__) # /*MSVC*/ # define file_offset_t __int64 # define file_seek _lseeki64 @@ -337,7 +337,7 @@ H5FD_sec2_open(const char *name, unsigned flags, hid_t UNUSED fapl_id, int o_flags; int fd=(-1); H5FD_sec2_t *file=NULL; -#ifdef WIN32 +#ifdef _WIN32 HFILE filehandle; struct _BY_HANDLE_FILE_INFORMATION fileinfo; #endif @@ -377,7 +377,7 @@ H5FD_sec2_open(const char *name, unsigned flags, hid_t UNUSED fapl_id, 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 _WIN32 filehandle = _get_osfhandle(fd); (void)GetFileInformationByHandle((HANDLE)filehandle, &fileinfo); file->fileindexhi = fileinfo.nFileIndexHigh; @@ -468,7 +468,7 @@ H5FD_sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2) FUNC_ENTER_NOAPI(H5FD_sec2_cmp, H5FD_VFD_DEFAULT) -#ifdef WIN32 +#ifdef _WIN32 if (f1->fileindexhi < f2->fileindexhi) HGOTO_DONE(-1) if (f1->fileindexhi > f2->fileindexhi) HGOTO_DONE(1) @@ -879,7 +879,7 @@ H5FD_sec2_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned UNUSED closing) /* Extend the file to make sure it's large enough */ if (file->eoa!=file->eof) { -#ifdef WIN32 +#ifdef _WIN32 HFILE filehandle; /* Windows file handle */ LARGE_INTEGER li; /* 64-bit integer for SetFilePointer() call */ @@ -892,10 +892,10 @@ H5FD_sec2_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned 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 /* _WIN32 */ if (-1==file_truncate(file->fd, (file_offset_t)file->eoa)) HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly") -#endif /* WIN32 */ +#endif /* _WIN32 */ /* Update the eof value */ file->eof = file->eoa; diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c index 6f1b204..c66b1ab 100644 --- a/src/H5FDstdio.c +++ b/src/H5FDstdio.c @@ -43,7 +43,7 @@ #include #endif -#ifdef WIN32 +#ifdef _WIN32 #include #include @@ -91,7 +91,7 @@ typedef struct H5FD_stdio_t { haddr_t pos; /*current file I/O position */ H5FD_stdio_file_op op; /*last operation */ unsigned write_access; /* Flag to indicate the file was opened with write access */ -#ifndef WIN32 +#ifndef _WIN32 /* * On most systems the combination of device and i-node number uniquely * identify a file. @@ -100,7 +100,7 @@ typedef struct H5FD_stdio_t { ino_t inode; /*file i-node number */ #else /* - * On WIN32 the low-order word of a unique identifier associated with the + * On _WIN32 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 @@ -116,7 +116,7 @@ typedef struct H5FD_stdio_t { #ifdef H5_HAVE_LSEEK64 # define file_offset_t off64_t # define file_truncate ftruncate64 -#elif defined (WIN32) && !defined(__MWERKS__) +#elif defined (_WIN32) && !defined(__MWERKS__) # /*MSVC*/ # define file_offset_t __int64 # define file_truncate _chsize @@ -323,13 +323,13 @@ H5FD_stdio_open( const char *name, unsigned flags, hid_t fapl_id, unsigned write_access=0; /* File opened with write access? */ H5FD_stdio_t *file=NULL; static const char *func="H5FD_stdio_open"; /* Function Name for error reporting */ -#ifdef WIN32 +#ifdef _WIN32 HFILE filehandle; struct _BY_HANDLE_FILE_INFORMATION fileinfo; int fd; -#else /* WIN32 */ +#else /* _WIN32 */ struct stat sb; -#endif /* WIN32 */ +#endif /* _WIN32 */ /* Sanity check on file offsets */ assert(sizeof(file_offset_t)>=sizeof(size_t)); @@ -393,7 +393,7 @@ H5FD_stdio_open( const char *name, unsigned flags, hid_t fapl_id, } /* The unique key */ -#ifdef WIN32 +#ifdef _WIN32 /*#error "Needs correct fileindexhi & fileindexlo, code below is from sec2 driver"*/ fd = _fileno(f); filehandle = _get_osfhandle(fd); @@ -473,7 +473,7 @@ H5FD_stdio_cmp(const H5FD_t *_f1, const H5FD_t *_f2) /* Clear the error stack */ H5Eclear2(H5E_DEFAULT); -#ifdef WIN32 +#ifdef _WIN32 if (f1->fileindexhi < f2->fileindexhi) return -1; if (f1->fileindexhi > f2->fileindexhi) return 1; @@ -964,7 +964,7 @@ H5FD_stdio_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing) if(file->write_access) { /* Makes sure that the true file size is the same as the end-of-address. */ if (file->eoa!=file->eof) { -#ifdef WIN32 +#ifdef _WIN32 int fd=_fileno(file->fp); /* File descriptor for HDF5 file */ HFILE filehandle; /* Windows file handle */ LARGE_INTEGER li; /* 64-bit integer for SetFilePointer() call */ @@ -978,12 +978,12 @@ H5FD_stdio_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing) (void)SetFilePointer((HANDLE)filehandle,li.LowPart,&li.HighPart,FILE_BEGIN); if(SetEndOfFile((HANDLE)filehandle)==0) H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR, "unable to extend file properly", -1) -#else /* WIN32 */ +#else /* _WIN32 */ int fd=fileno(file->fp); /* File descriptor for HDF5 file */ if (-1==file_truncate(fd, (file_offset_t)file->eoa)) H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR, "unable to extend file properly", -1) -#endif /* WIN32 */ +#endif /* _WIN32 */ /* Update the eof value */ file->eof = file->eoa; diff --git a/src/H5FDstream.c b/src/H5FDstream.c index 678a1e5..06eaaaf 100644 --- a/src/H5FDstream.c +++ b/src/H5FDstream.c @@ -624,7 +624,7 @@ H5FD_stream_open (const char *filename, H5FD_stream_t *stream=NULL; const H5FD_stream_fapl_t *fapl; int o_flags; -#ifdef WIN32 +#ifdef _WIN32 WSADATA wsadata; #endif H5P_genplist_t *plist=NULL; /* Property list pointer */ @@ -649,7 +649,7 @@ H5FD_stream_open (const char *filename, if ((O_RDWR & o_flags) && ! (O_CREAT & o_flags)) HGOTO_ERROR (H5E_ARGS, H5E_UNSUPPORTED, NULL, "open stream for read/write not supported") -#ifdef WIN32 +#ifdef _WIN32 if (WSAStartup (MAKEWORD (2, 0), &wsadata)) HGOTO_ERROR (H5E_IO, H5E_CANTINIT, NULL, "Couldn't start Win32 socket layer") #endif diff --git a/src/H5Omtime.c b/src/H5Omtime.c index 39d9a16..0a70e5b 100644 --- a/src/H5Omtime.c +++ b/src/H5Omtime.c @@ -27,7 +27,7 @@ #include "H5MMprivate.h" /* Memory management */ #include "H5Opkg.h" /* Object headers */ -#if defined (WIN32) && !defined (__MWERKS__) +#if defined (_WIN32) && !defined (__MWERKS__) #include #include #endif @@ -247,7 +247,7 @@ H5O_mtime_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, unsigned UNUSED mesg_fla the_time -= tz.tz_minuteswest * 60 - (tm.tm_isdst ? 3600 : 0); } -#elif defined (WIN32) +#elif defined (_WIN32) #if !defined (__MWERKS__) /* MSVC */ { struct timeb timebuffer; @@ -264,7 +264,7 @@ H5O_mtime_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, unsigned UNUSED mesg_fla ; #endif /*__MWERKS__*/ -#else /* WIN32 */ +#else /* _WIN32 */ /* * The catch-all. If we can't convert a character string universal * coordinated time to a time_t value reliably then we can't decode the diff --git a/src/H5api_adpt.h b/src/H5api_adpt.h index b93431f..740eab5 100644 --- a/src/H5api_adpt.h +++ b/src/H5api_adpt.h @@ -21,7 +21,7 @@ #ifndef H5API_ADPT_H #define H5API_ADPT_H -#if defined(WIN32) || defined(_WIN32) +#if defined(_WIN32) #if defined(_HDF5DLL_) #pragma warning(disable: 4273) /* Disable the dll linkage warnings */ @@ -108,7 +108,7 @@ #define H5_DLLCPP #endif /* HDF5_CPPDLL_EXPORTS */ -#else /*WIN32*/ +#else /*_WIN32*/ #define H5_DLL #define H5_HLDLL #define H5_HLCPPDLL diff --git a/src/H5detect.c b/src/H5detect.c index 07c5b12..3cfa89a 100644 --- a/src/H5detect.c +++ b/src/H5detect.c @@ -1088,7 +1088,7 @@ bit.\n"; * The FQDM of this host or the empty string. */ #ifdef H5_HAVE_GETHOSTNAME -#ifdef WIN32 +#ifdef _WIN32 /* windows DLL cannot recognize gethostname, so turn off on windows for the time being! KY, 2003-1-14 */ host_name[0] = '\0'; diff --git a/src/H5private.h b/src/H5private.h index eff8964..493818f 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -140,12 +140,12 @@ #endif -#ifdef WIN32 +#ifdef _WIN32 #define VC_EXTRALEAN /*Exclude rarely-used stuff from Windows headers */ #include -#endif /*WIN32*/ +#endif /*_WIN32*/ /* H5_inline */ #ifndef H5_inline @@ -564,11 +564,11 @@ typedef enum { #define HDfgetc(F) fgetc(F) #define HDfgetpos(F,P) fgetpos(F,P) #define HDfgets(S,N,F) fgets(S,N,F) -#ifdef WIN32 +#ifdef _WIN32 #define HDfileno(F) _fileno(F) -#else /* WIN32 */ +#else /* _WIN32 */ #define HDfileno(F) fileno(F) -#endif /* WIN32 */ +#endif /* _WIN32 */ #define HDfloor(X) floor(X) #define HDfmod(X,Y) fmod(X,Y) #define HDfopen(S,M) fopen(S,M) @@ -604,7 +604,7 @@ H5_DLL int HDfprintf (FILE *stream, const char *fmt, ...); * For Unix, if off_t is not 64bit big, try use the pseudo-standard * xxx64 versions if available. */ -#ifdef WIN32 +#ifdef _WIN32 #ifdef __MWERKS__ #define HDfstat(F,B) fstat(F,B) #define HDstat(S,B) stat(S,B) @@ -674,7 +674,7 @@ H5_DLL int HDfprintf (FILE *stream, const char *fmt, ...); #define HDlog(X) log(X) #define HDlog10(X) log10(X) #define HDlongjmp(J,N) longjmp(J,N) -#ifdef WIN32 +#ifdef _WIN32 #ifdef __MWERKS__ #define HDlseek(F,O,W) lseek(F,O,W) #else /*MSVS */ @@ -701,18 +701,18 @@ H5_DLL int HDfprintf (FILE *stream, const char *fmt, ...); #define HDmemcpy(X,Y,Z) memcpy((char*)(X),(const char*)(Y),Z) #define HDmemmove(X,Y,Z) memmove((char*)(X),(const char*)(Y),Z) /* - * The (void*) cast just avoids a compiler warning in WIN32 + * The (void*) cast just avoids a compiler warning in _WIN32 */ -#ifdef WIN32 +#ifdef _WIN32 #define HDmemset(X,C,Z) memset((void*)(X),C,Z) -#else /* WIN32 */ +#else /* _WIN32 */ #define HDmemset(X,C,Z) memset(X,C,Z) -#endif /* WIN32 */ -#ifdef WIN32 +#endif /* _WIN32 */ +#ifdef _WIN32 #define HDmkdir(S,M) _mkdir(S) -#else /* WIN32 */ +#else /* _WIN32 */ #define HDmkdir(S,M) mkdir(S,M) -#endif /* WIN32 */ +#endif /* _WIN32 */ #define HDmkfifo(S,M) mkfifo(S,M) #define HDmktime(T) mktime(T) #define HDmodf(X,Y) modf(X,Y) @@ -772,7 +772,7 @@ int HDremove_all(const char * fname); #define HDsetpgid(P,PG) setpgid(P,PG) #define HDsetsid() setsid() #define HDsetuid(U) setuid(U) -#ifndef WIN32 +#ifndef _WIN32 #define HDsetvbuf(F,S,M,Z) setvbuf(F,S,M,Z) #endif #define HDsigaction(N,A) sigaction(N,A) @@ -790,7 +790,7 @@ int HDremove_all(const char * fname); #define HDsin(X) sin(X) #define HDsinh(X) sinh(X) #define HDsleep(N) sleep(N) -#ifdef WIN32 +#ifdef _WIN32 #define HDsnprintf _snprintf /*varargs*/ #else #define HDsnprintf snprintf /*varargs*/ @@ -854,7 +854,7 @@ H5_DLL int64_t HDstrtoll (const char *s, const char **rest, int base); #define HDumask(N) umask(N) #define HDuname(S) uname(S) #define HDungetc(C,F) ungetc(C,F) -#ifdef WIN32 +#ifdef _WIN32 #define HDunlink(S) _unlink(S) #else #define HDunlink(S) unlink(S) @@ -867,7 +867,7 @@ H5_DLL int64_t HDstrtoll (const char *s, const char **rest, int base); #define HDvfprintf(F,FMT,A) vfprintf(F,FMT,A) #define HDvprintf(FMT,A) vprintf(FMT,A) #define HDvsprintf(S,FMT,A) vsprintf(S,FMT,A) -#ifdef WIN32 +#ifdef _WIN32 # define HDvsnprintf(S,N,FMT,A) _vsnprintf(S,N,FMT,A) #else # define HDvsnprintf(S,N,FMT,A) vsnprintf(S,N,FMT,A) @@ -890,9 +890,9 @@ H5_DLL int64_t HDstrtoll (const char *s, const char **rest, int base); * 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); @@ -900,7 +900,7 @@ extern char *strdup(const char *s); #define HDstrdup(S) strdup(S) -#endif /* WIN32 */ +#endif /* _WIN32 */ /* diff --git a/test/flush2.c b/test/flush2.c index f8d8aa8..6a07c78 100644 --- a/test/flush2.c +++ b/test/flush2.c @@ -197,7 +197,7 @@ main(void) PASSED() else { -#if defined WIN32 && defined _HDF5USEDLL_ +#if defined _WIN32 && defined _HDF5USEDLL_ SKIPPED(); puts(" DLL will flush the file even when calling _exit, skip this test temporarily"); @@ -219,7 +219,7 @@ main(void) PASSED() else { -#if defined WIN32 && defined _HDF5USEDLL_ +#if defined _WIN32 && defined _HDF5USEDLL_ SKIPPED(); puts(" DLL will flush the file even when calling _exit, skip this test temporarily"); diff --git a/test/h5test.c b/test/h5test.c index 965c065..8e12a43 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -26,11 +26,11 @@ #include #include "h5test.h" -#ifdef WIN32 +#ifdef _WIN32 #include #include #include -#endif /* WIN32 */ +#endif /* _WIN32 */ /* * Define these environment variables or constants to influence functions in @@ -632,7 +632,7 @@ void h5_show_hostname(void) { char hostname[80]; -#ifdef WIN32 +#ifdef _WIN32 WSADATA wsaData; int err; #endif @@ -650,7 +650,7 @@ h5_show_hostname(void) printf("thread 0."); } #elif defined(H5_HAVE_THREADSAFE) -#ifdef WIN32 +#ifdef _WIN32 printf("some thread: no way to know the thread number from pthread on windows."); #else printf("thread %d.", (int)pthread_self()); @@ -659,7 +659,7 @@ h5_show_hostname(void) #else printf("thread 0."); #endif -#ifdef WIN32 +#ifdef _WIN32 err = WSAStartup( MAKEWORD(2,2), &wsaData ); if ( err != 0 ) { @@ -689,7 +689,7 @@ h5_show_hostname(void) #else printf(" gethostname not supported\n"); #endif -#ifdef WIN32 +#ifdef _WIN32 WSACleanup(); #endif } diff --git a/test/tvlstr.c b/test/tvlstr.c index e41da26..a73151b 100644 --- a/test/tvlstr.c +++ b/test/tvlstr.c @@ -21,7 +21,7 @@ * *************************************************************/ -#ifdef WIN32 +#ifdef _WIN32 #include #endif diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c index 4cd6037..da67fe9 100644 --- a/testpar/t_mdset.c +++ b/testpar/t_mdset.c @@ -459,7 +459,7 @@ void big_dataset(void) /* Check that file of the correct size was created */ file_size=h5_get_file_size(filename); -#ifndef WIN32 +#ifndef _WIN32 VRFY((file_size == 2147485696ULL), "File is correct size (~2GB)"); #endif @@ -490,7 +490,7 @@ void big_dataset(void) /* Check that file of the correct size was created */ file_size=h5_get_file_size(filename); -#ifndef WIN32 +#ifndef _WIN32 VRFY((file_size == 4294969344ULL), "File is correct size (~4GB)"); #endif @@ -521,7 +521,7 @@ void big_dataset(void) /* Check that file of the correct size was created */ file_size=h5_get_file_size(filename); -#ifndef WIN32 +#ifndef _WIN32 VRFY((file_size == 8589936640ULL), "File is correct size (~8GB)"); #endif diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c index 0c81fe7..495bae0 100644 --- a/testpar/testphdf5.c +++ b/testpar/testphdf5.c @@ -394,8 +394,8 @@ int main(int argc, char **argv) "collective group and dataset write", &collngroups_params); AddTest("ingrpr", independent_group_read, NULL, "independent group and dataset read", &collngroups_params); - /* By default, do not run big dataset on WIN32. */ -#ifdef WIN32 + /* By default, do not run big dataset on _WIN32. */ +#ifdef _WIN32 AddTest("-bigdset", big_dataset, NULL, "big dataset test", PARATESTFILE); #else diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c index 78184fd..463230e 100644 --- a/tools/h5dump/h5dumpgentest.c +++ b/tools/h5dump/h5dumpgentest.c @@ -1190,7 +1190,7 @@ static void gent_many(void) for (i0 = 0; i0 < 2; i0++) { dset1[j].a[i3][i2][i1][i0] = i0+j; dset1[j].b[i3][i2][i1][i0] = (double)(i0+j); -#ifdef WIN32 +#ifdef _WIN32 dset1[j].c[i3][i2][i1][i0] = (double)(i0+j+(signed __int64)sdim); #else dset1[j].c[i3][i2][i1][i0] = (double)(i0+j+sdim); 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); 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++) diff --git a/tools/h5jam/h5jamgentest.c b/tools/h5jam/h5jamgentest.c index 2498cd2..0ae81d8 100644 --- a/tools/h5jam/h5jamgentest.c +++ b/tools/h5jam/h5jamgentest.c @@ -330,11 +330,11 @@ create_textfile(const char *name, size_t size) size_t i; char *bp; - #ifdef WIN32 + #ifdef _WIN32 fd = _creat(name, _S_IREAD | _S_IWRITE); - #else /* WIN32 */ + #else /* _WIN32 */ fd = creat(name,(mode_t)0777); - #endif /* WIN32 */ + #endif /* _WIN32 */ if (fd < 0) { /* panic */ } diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c index d19f200..a362250 100644 --- a/tools/h5ls/h5ls.c +++ b/tools/h5ls/h5ls.c @@ -1559,7 +1559,7 @@ dataset_list2(hid_t dset, const char UNUSED *name) (unsigned long)total, 1==total?"":"s", (unsigned long)used, 1==used?"":"s"); if (used>0) { -#ifdef WIN32 +#ifdef _WIN32 utilization = (hssize_t)total * 100.0 / (hssize_t)used; #else utilization = (total*100.0)/used; diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c index 376daef..df26d52 100644 --- a/tools/lib/h5tools_utils.c +++ b/tools/lib/h5tools_utils.c @@ -100,13 +100,13 @@ warn_msg(const char *progname, const char *fmt, ...) va_start(ap, fmt); HDfflush(stdout); -#ifdef WIN32 +#ifdef _WIN32 HDfprintf(stdout, "%s warning: ", progname); HDvfprintf(stdout, fmt, ap); -#else /* WIN32 */ +#else /* _WIN32 */ HDfprintf(stderr, "%s warning: ", progname); HDvfprintf(stderr, fmt, ap); -#endif /* WIN32 */ +#endif /* _WIN32 */ va_end(ap); } diff --git a/tools/misc/h5repart.c b/tools/misc/h5repart.c index e9406e2..505b9e4 100644 --- a/tools/misc/h5repart.c +++ b/tools/misc/h5repart.c @@ -45,7 +45,7 @@ # include #endif -#ifdef WIN32 +#ifdef _WIN32 # include # include #endif @@ -216,7 +216,7 @@ main (int argc, char *argv[]) int dst_is_family; /*is dst name a family name? */ int dst_membno=0; /*destination member number */ -#if defined(WIN32) && ! defined (__MWERKS__) +#if defined(_WIN32) && ! defined (__MWERKS__) __int64 left_overs=0; /*amount of zeros left over */ __int64 src_offset=0; /*offset in source member */ __int64 dst_offset=0; /*offset in destination member */ -- cgit v0.12