mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-24 15:25:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r19171] Bug fix: 1917.

Browse Source 
The previous fix had the Windows code in H5private.h but they should have been
in H5win32defs.h which holds all Windows-specific definitions.  Moved the fix.

Tested: BP (AIX) to confirm the fix is still valid. Windows tests will occur
in daily tests tonight.
This commit is contained in:
Albert Cheng 2010-08-04 19:15:08 -05:00
parent e86d77f479
commit dc51db6583
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/H5private.h
View File

@ -480,8 +480,9 @@ typedef struct {
* function (or any other non-HDF5 function) in the source!
*/
/* Use platform-specific versions if necessary */
#include "H5win32defs.h"
/* Put all platform-specific definitions in the following file */
/* so that the following definitions are platform free. */
#include "H5win32defs.h" /* For Windows-specific definitions */
#ifndef HDabort
#define HDabort() abort()
@ -912,18 +913,14 @@ H5_DLL int HDfprintf (FILE *stream, const char *fmt, ...);
#ifndef HDlongjmp
#define HDlongjmp(J,N) longjmp(J,N)
#endif /* HDlongjmp */
/* HDlseek and HDoff_t must be defined together for consistency. */
#ifndef HDlseek
#ifdef H5_HAVE_LSEEK64
#define HDlseek(F,O,W) lseek64(F,O,W)
#define HDoff_t off64_t
#else
#define HDlseek(F,O,W) lseek(F,O,W)
#if defined (_WIN32) && !defined(__MWERKS__)
# /*MSVC*/
# define HDoff_t __int64
#else
# define HDoff_t off_t
#endif
#define HDoff_t off_t
#endif
#endif /* HDlseek */
#ifndef HDmalloc

6
src/H5win32defs.h
View File

@ -56,6 +56,12 @@ 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 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)