From 2ef1d47a76dbfbde0b4bce737a3d6a3f9800615d Mon Sep 17 00:00:00 2001 From: Pedro Vicente Nunes Date: Tue, 7 Sep 2004 14:44:18 -0500 Subject: [svn-r9218] 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: --- src/H5Omtime.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/H5Omtime.c b/src/H5Omtime.c index bc6a604..6044988 100644 --- a/src/H5Omtime.c +++ b/src/H5Omtime.c @@ -243,20 +243,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 -- cgit v0.12