diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2004-09-07 19:42:35 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2004-09-07 19:42:35 (GMT) |
| commit | bf22056ecdcc51da8f1b9500ab8e709da658dcc2 (patch) | |
| tree | 48177d74159014c057a3ac3dbe158d8805ec1d40 | |
| parent | 1802494959ea4110d336a152c67217091bb35b26 (diff) | |
| download | hdf5-bf22056ecdcc51da8f1b9500ab8e709da658dcc2.zip hdf5-bf22056ecdcc51da8f1b9500ab8e709da658dcc2.tar.gz hdf5-bf22056ecdcc51da8f1b9500ab8e709da658dcc2.tar.bz2 | |
[svn-r9217] Purpose:
bug fix
Description:
The H5O_mtime_decode function was not handling properly the case for the
Code Warrior compiler
Solution:
Platforms tested:
Code Warrior
Misc. update:
| -rw-r--r-- | src/H5Omtime.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/H5Omtime.c b/src/H5Omtime.c index 2c53950..05052cf 100644 --- a/src/H5Omtime.c +++ b/src/H5Omtime.c @@ -170,8 +170,6 @@ done: * matzke@llnl.gov * Jul 24 1998 * - * Modifications: - * *------------------------------------------------------------------------- */ static void * @@ -248,20 +246,24 @@ H5O_mtime_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const uint8_t *p, the_time -= tz.tz_minuteswest * 60 - (tm.tm_isdst ? 3600 : 0); } -#elif defined (WIN32) && !defined (__MWERKS__) +#elif defined (WIN32) + #if !defined (__MWERKS__) /* MSVC */ { - struct timeb timebuffer; - long tz; - - ftime(&timebuffer); - tz = timebuffer.timezone; - /* daylight is not handled properly. Currently we just hard-code - the problem. */ -/* the_time -= tz * 60; */ - the_time -= tz * 60 - 3600; -/* the_time -= tz * 60 - 3600 * _daylight;*/ + struct timeb timebuffer; + long tz; + + ftime(&timebuffer); + tz = timebuffer.timezone; + /* daylight is not handled properly. Currently we just hard-code + the problem. */ + the_time -= tz * 60 - 3600; } -#else + #else /*__MWERKS__*/ + + ; + + #endif /*__MWERKS__*/ +#else /* WIN32 */ /* * The catch-all. If we can't convert a character string universal * coordinated time to a time_t value reliably then we can't decode the |