summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2004-09-07 19:44:18 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2004-09-07 19:44:18 (GMT)
commit2ef1d47a76dbfbde0b4bce737a3d6a3f9800615d (patch)
tree2492e985e0c7e78a5fa50aec509a1650beb7ba2b
parent068639ae747cb11f9c600753f23b6e3a31f0ec4d (diff)
downloadhdf5-2ef1d47a76dbfbde0b4bce737a3d6a3f9800615d.zip
hdf5-2ef1d47a76dbfbde0b4bce737a3d6a3f9800615d.tar.gz
hdf5-2ef1d47a76dbfbde0b4bce737a3d6a3f9800615d.tar.bz2
[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:
-rw-r--r--src/H5Omtime.c28
1 files 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