diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5FDlog.c | 31 | ||||
| -rw-r--r-- | src/H5FDsec2.c | 31 | ||||
| -rw-r--r-- | src/H5FDstdio.c | 7 | ||||
| -rw-r--r-- | src/H5FDstream.c | 11 | ||||
| -rw-r--r-- | src/H5Oefl.c | 2 | ||||
| -rw-r--r-- | src/H5Ppublic.h | 2 | ||||
| -rw-r--r-- | src/H5private.h | 55 |
7 files changed, 53 insertions, 86 deletions
diff --git a/src/H5FDlog.c b/src/H5FDlog.c index 4c37651..a9ba785 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -105,35 +105,6 @@ typedef struct H5FD_log_t { } H5FD_log_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 /* @@ -986,7 +957,7 @@ H5FD_log_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, hadd while (size>0) { do { assert(size==(hsize_t)((size_t)size)); /*check for overflow*/ - nbytes = HDwrite(file->fd, buf, (size_t)size); + nbytes = HDwrite(file->fd, (void*)buf, (size_t)size); } while (-1==nbytes && EINTR==errno); if (-1==nbytes) { /* error */ diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c index 2cfa24e..6e77bf5 100644 --- a/src/H5FDsec2.c +++ b/src/H5FDsec2.c @@ -75,35 +75,6 @@ typedef struct H5FD_sec2_t { #endif } H5FD_sec2_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 /* @@ -665,7 +636,7 @@ H5FD_sec2_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, had while (size>0) { do { assert(size==(hsize_t)((size_t)size)); /*check for overflow*/ - nbytes = HDwrite(file->fd, buf, (size_t)size); + nbytes = HDwrite(file->fd, (void*)buf, (size_t)size); } while (-1==nbytes && EINTR==errno); if (-1==nbytes) { /* error */ diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c index c852208..eccba8f 100644 --- a/src/H5FDstdio.c +++ b/src/H5FDstdio.c @@ -20,12 +20,7 @@ #include <unistd.h> #endif -#ifdef WIN32 -#include <windows.h> -#include <io.h> -#endif /*kent yang 6/21/2001, must be added for defination of open,write.... - also the defination of longlong is valid, will investigate this to - make sure int64 can replace longlong. Otherwise, keep windows.h*/ + #ifdef MAX #undef MAX diff --git a/src/H5FDstream.c b/src/H5FDstream.c index 924ab9e..9db2b18 100644 --- a/src/H5FDstream.c +++ b/src/H5FDstream.c @@ -26,6 +26,8 @@ /* Only build this driver if it was configured with --with-Stream-VFD */ #ifdef H5_HAVE_STREAM +#include "H5private.h" + #include "H5Eprivate.h" /* error handling */ #include "H5FDpublic.h" /* VFD structures */ #include "H5MMprivate.h" /* memory allocation */ @@ -132,11 +134,10 @@ static const H5FD_stream_fapl_t default_fapl = * REGION_OVERFLOW: Checks whether an address and size pair describe data * which can be addressed entirely in memory. */ -#ifdef H5_HAVE_LSEEK64 -# define file_offset_t off64_t -#else -# define file_offset_t off_t -#endif + + + + #define MAXADDR (((haddr_t)1<<(8*sizeof(file_offset_t)-1))-1) #define ADDR_OVERFLOW(A) (HADDR_UNDEF==(A) || \ ((A) & ~(haddr_t)MAXADDR)) diff --git a/src/H5Oefl.c b/src/H5Oefl.c index c5ac308..de6595b 100644 --- a/src/H5Oefl.c +++ b/src/H5Oefl.c @@ -537,7 +537,7 @@ H5O_efl_write (H5F_t UNUSED *f, const H5O_efl_t *efl, haddr_t addr, "unable to seek in external raw data file"); } to_write = MIN(efl->slot[i].size-skip, size); - if ((size_t)HDwrite (fd, buf, to_write)!=to_write) { + if ((size_t)HDwrite (fd, (void*)buf, to_write)!=to_write) { HGOTO_ERROR (H5E_EFL, H5E_READERROR, FAIL, "write error in external raw data file"); } diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h index ebaeb31..1fa1bf1 100644 --- a/src/H5Ppublic.h +++ b/src/H5Ppublic.h @@ -20,6 +20,7 @@ /* Default Template for creation, access, etc. templates */ #define H5P_DEFAULT 0 +#include <H5private.h> /* Public headers needed by this file */ #include "H5public.h" #include "H5Ipublic.h" @@ -28,7 +29,6 @@ #include "H5MMpublic.h" #include "H5Zpublic.h" -/*pvn*/ /* Property list classes */ typedef enum H5P_class_t { diff --git a/src/H5private.h b/src/H5private.h index 8d69949..02c5bbf 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -139,7 +139,6 @@ * HDF5 is currently supported on _X86_ * including <windows.h> has the side effect of introducing thousands of Windows GUI * macros and type declarations to the compilation environment, so we don't include it - * pvn */ #if !defined(_68K_) && !defined(_MPPC_) && !defined(_PPC_) && !defined(_ALPHA_) && !defined(_MIPS_) && !defined(_X86_) && defined(_M_IX86) @@ -148,7 +147,7 @@ #include <windef.h> #include <winbase.h> -#include <IO.h> /* kent yang 6/18/2001*/ +#include <io.h> /* H5_inline */ @@ -158,13 +157,8 @@ #endif /* -syntax: - -inline function_declarator; // C++ Specific -__inline function_declarator; // Microsoft Specific -The inline and __inline keywords allow the compiler to insert a copy of +The inline keywords allows the compiler to insert a copy of the function body into each place the function is called - inline is now in C but in the C99 standard and not the old C89 version so MS doesn't recognize it yet (as of April 2001) */ @@ -172,16 +166,48 @@ MS doesn't recognize it yet (as of April 2001) # define H5_inline inline # else # define H5_inline -#endif /*__MWERKS__*/ +#endif /* Metroworks <sys/types.h> doesn't define off_t. */ #ifdef __MWERKS__ typedef long off_t; /* Metroworks does not define EINTR in <errno.h> */ # define EINTR 4 -#endif /*__MWERKS__*/ +#endif +/*__MWERKS__*/ + +#endif +/*WIN32*/ + +/* + * 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. + */ -#endif /*WIN32*/ +#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 #ifndef F_OK # define F_OK 00 @@ -189,6 +215,9 @@ typedef long off_t; # define R_OK 04 #endif + + + /* * Pablo support files. */ @@ -767,9 +796,9 @@ __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 +#if defined (__MWERKS__) #define HDstrdup(S) _strdup(S) -#else /* WIN32 */ +#else #if !defined strdup && !defined H5_HAVE_STRDUP extern char *strdup(const char *s); |