From 45993ee78e44b410b77fa5a4fdf3a583fe51ae6d Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Fri, 29 Jun 2001 14:32:06 -0500 Subject: [svn-r4087] Purpose: Code cleanup Description: Fix copy & paste error when merging in the last round of CodeWarrior changes. Platforms tested: FreeBSD 4.3 (hawkwind) --- src/H5FDlog.c | 11 +++++++++++ src/H5FDsec2.c | 13 +++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/H5FDlog.c b/src/H5FDlog.c index e7b663c..638ceaf 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -114,9 +114,20 @@ typedef struct H5FD_log_t { * file_seek: The function which adjusts the current file position, * either lseek() or lseek64(). */ +/* adding for windows NT file system support. */ +/* pvn: added __MWERKS__ support. */ + #ifdef H5_HAVE_LSEEK64 # 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 #else # define file_offset_t off_t # define file_seek lseek diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c index 4c9f967..f7f600e 100644 --- a/src/H5FDsec2.c +++ b/src/H5FDsec2.c @@ -87,19 +87,24 @@ typedef struct H5FD_sec2_t { * either lseek() or lseek64(). */ /* adding for windows NT file system support. */ +/* pvn: added __MWERKS__ support. */ #ifdef H5_HAVE_LSEEK64 # define file_offset_t off64_t # define file_seek lseek64 -#elif defined WIN32 -# define file_offset_t __int64 -# define file_seek _lseeki64 +#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 #else # define file_offset_t off_t # define file_seek lseek #endif - /* * These macros check for overflow of various quantities. These macros * assume that file_offset_t is signed and haddr_t and size_t are unsigned. -- cgit v0.12