diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2010-11-16 21:40:04 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2010-11-16 21:40:04 (GMT) |
| commit | c249ccfd1502c428b820d6316a5cf7a0a9d5ca82 (patch) | |
| tree | 6480ed46a173986a61e556339a97330a5d81907f /src | |
| parent | 69a531786037ecb77933e676d05c5a5cd1dbba4b (diff) | |
| download | hdf5-c249ccfd1502c428b820d6316a5cf7a0a9d5ca82.zip hdf5-c249ccfd1502c428b820d6316a5cf7a0a9d5ca82.tar.gz hdf5-c249ccfd1502c428b820d6316a5cf7a0a9d5ca82.tar.bz2 | |
[svn-r19796] Bug 2091: remove all Metraowerks compiler code bracheted by __MWERKS__.
Metraowerks compiler is no more. Make the code cleaner.
Tested: H5committest plus jam serial.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5FDdirect.c | 2 | ||||
| -rw-r--r-- | src/H5FDlog.c | 10 | ||||
| -rw-r--r-- | src/H5FDmpiposix.c | 2 | ||||
| -rw-r--r-- | src/H5win32defs.h | 7 |
4 files changed, 6 insertions, 15 deletions
diff --git a/src/H5FDdirect.c b/src/H5FDdirect.c index 70b33f7..29fd84f 100644 --- a/src/H5FDdirect.c +++ b/src/H5FDdirect.c @@ -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) # /*MSVC*/ # define file_offset_t __int64 # define file_seek _lseeki64 diff --git a/src/H5FDlog.c b/src/H5FDlog.c index c21fc92..9e81c42 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -135,13 +135,9 @@ typedef struct H5FD_log_t { # define file_offset_t off64_t # define file_seek lseek64 #elif defined (_WIN32) -# ifdef __MWERKS__ -# define file_offset_t off_t -# define file_seek lseek -# else /*MSVC*/ -# define file_offset_t __int64 -# define file_seek _lseeki64 -# endif +# /*MSVC*/ +# define file_offset_t __int64 +# define file_seek _lseeki64 #else # define file_offset_t off_t # define file_seek lseek diff --git a/src/H5FDmpiposix.c b/src/H5FDmpiposix.c index 5bea8fe..7ca38cc 100644 --- a/src/H5FDmpiposix.c +++ b/src/H5FDmpiposix.c @@ -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) # /*MSVC*/ # define file_offset_t __int64 # define file_seek _lseeki64 diff --git a/src/H5win32defs.h b/src/H5win32defs.h index d478e4c..fb37059 100644 --- a/src/H5win32defs.h +++ b/src/H5win32defs.h @@ -56,12 +56,7 @@ typedef __int64 h5_stat_size_t; #endif /* H5_HAVE_GETTIMEOFDAY */ #define HDgetdrive() _getdrive() #define HDlseek(F,O,W) _lseeki64(F,O,W) -#if !defined(__MWERKS__) -# /*MSVC*/ -# define HDoff_t __int64 -#else -# define HDoff_t off_t -#endif +#define HDoff_t __int64 #define HDmemset(X,C,Z) memset((void*)(X),C,Z) #define HDmkdir(S,M) _mkdir(S) #define HDopen(S,F,M) _open(S,F|_O_BINARY,M) |