From 3b2053492a7bb326c118633ad5e5d50985b7bf2b Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Wed, 17 Oct 2001 15:25:03 -0500 Subject: [svn-r4554] Purpose: Bug Fix Description: Section of code which defined file offset and length macros was removed a while ago and found during testing just now. Solution: Replaced section of code to define macros. Platforms tested: IRIX64 6.5 (modi4) --- src/H5FDdpss.c | 30 ++++++++++++++++++++++++++++++ src/H5FDgass.c | 30 ++++++++++++++++++++++++++++++ src/H5FDsrb.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+) diff --git a/src/H5FDdpss.c b/src/H5FDdpss.c index d9a7270..6fa1bc6 100644 --- a/src/H5FDdpss.c +++ b/src/H5FDdpss.c @@ -52,6 +52,36 @@ typedef struct H5FD_dpss_t { } H5FD_dpss_t; +/* + * This driver supports systems that have the lseek64() function by defining + * some macros here so we don't have to have conditional compilations later + * throughout the code. + * + * file_offset_t: The datatype for file offsets, the second argument of + * the lseek() or lseek64() call. + * + * 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 +#endif + /* * These macros check for overflow of various quantities. These macros diff --git a/src/H5FDgass.c b/src/H5FDgass.c index 3f139b1..aeaf60e 100644 --- a/src/H5FDgass.c +++ b/src/H5FDgass.c @@ -54,6 +54,36 @@ typedef struct H5FD_gass_t { } H5FD_gass_t; +/* + * This driver supports systems that have the lseek64() function by defining + * some macros here so we don't have to have conditional compilations later + * throughout the code. + * + * file_offset_t: The datatype for file offsets, the second argument of + * the lseek() or lseek64() call. + * + * 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 +#endif + /* diff --git a/src/H5FDsrb.c b/src/H5FDsrb.c index d8cffc8..d98288a 100644 --- a/src/H5FDsrb.c +++ b/src/H5FDsrb.c @@ -22,6 +22,36 @@ static hid_t H5FD_SRB_g = 0; #ifdef H5_HAVE_SRB +/* + * This driver supports systems that have the lseek64() function by defining + * some macros here so we don't have to have conditional compilations later + * throughout the code. + * + * file_offset_t: The datatype for file offsets, the second argument of + * the lseek() or lseek64() call. + * + * 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 +#endif + /* * These macros check for overflow of various quantities. These macros -- cgit v0.12