diff options
| author | MuQun Yang <ymuqun@hdfgroup.org> | 2002-12-13 16:25:51 (GMT) |
|---|---|---|
| committer | MuQun Yang <ymuqun@hdfgroup.org> | 2002-12-13 16:25:51 (GMT) |
| commit | 1c0e435421c64f550040a2d34e63535e69dfcfb2 (patch) | |
| tree | a6e69987fcdbc1f2cf62540d750f321988ab48d0 /src | |
| parent | ae1e58baeab79e06a94d23b57231beb604762738 (diff) | |
| download | hdf5-1c0e435421c64f550040a2d34e63535e69dfcfb2.zip hdf5-1c0e435421c64f550040a2d34e63535e69dfcfb2.tar.gz hdf5-1c0e435421c64f550040a2d34e63535e69dfcfb2.tar.bz2 | |
[svn-r6202]
Purpose:
Fix bugs for windows platform.
Description:
1. Update HDlseek for windows
2. Update H5Otime.c for normal time(non-daylight time)
3. Add H5_DLL in front of two functions so that windows DLL can work.
Solution:
Platforms tested:
windows 2000, eirene(since most updates have WIN32 around it, not need to test other platforms)
Misc. update:
Update MANIFEST if you add or remove any file.
Update release_docs/RELEASE for bug fixes, new features, etc.
Update applicable document files too.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Omtime.c | 4 | ||||
| -rw-r--r-- | src/H5Zprivate.h | 4 | ||||
| -rw-r--r-- | src/H5private.h | 8 |
3 files changed, 12 insertions, 4 deletions
diff --git a/src/H5Omtime.c b/src/H5Omtime.c index c8fcf5a..e31dece 100644 --- a/src/H5Omtime.c +++ b/src/H5Omtime.c @@ -149,8 +149,8 @@ H5O_mtime_decode(H5F_t UNUSED *f, const uint8_t *p, tz = timebuffer.timezone; /* daylight is not handled properly. Currently we just hard-code the problem. */ - /*the_time -= tz*60;*/ - the_time -= tz * 60 - 3600 * _daylight; + the_time -= tz*60; +/* the_time -= tz * 60 - 3600 * _daylight;*/ } #else /* diff --git a/src/H5Zprivate.h b/src/H5Zprivate.h index 388f204..5f05dc8 100644 --- a/src/H5Zprivate.h +++ b/src/H5Zprivate.h @@ -45,11 +45,11 @@ H5_DLL H5Z_class_t *H5Z_find(H5Z_filter_t id); /* Filter routines */ -size_t H5Z_filter_deflate(unsigned flags, size_t cd_nelmts, +H5_DLL size_t H5Z_filter_deflate(unsigned flags, size_t cd_nelmts, const unsigned cd_values[], size_t nbytes, size_t *buf_size, void **buf); -size_t H5Z_filter_shuffle(unsigned flags, size_t cd_nelmts, +H5_DLL size_t H5Z_filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[], size_t nbytes, size_t *buf_size, void **buf); #endif diff --git a/src/H5private.h b/src/H5private.h index 1cd39c3..e4ba48b 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -622,7 +622,15 @@ typedef struct stat h5_stat_t; #define HDlog(X) log(X) #define HDlog10(X) log10(X) #define HDlongjmp(J,N) longjmp(J,N) +#ifdef WIN32 + #ifdef __MWERKS__ + #define HDlseek(F,O,W) lseek(F,O,W) + #else /*MSVS */ + #define HDlseek(F,O,W) _lseeki64(F,O,W) + #endif +#else #define HDlseek(F,O,W) lseek(F,O,W) +#endif #define HDmalloc(Z) malloc(Z) #define HDmblen(S,N) mblen(S,N) #define HDmbstowcs(P,S,Z) mbstowcs(P,S,Z) |