summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMuQun Yang <ymuqun@hdfgroup.org>2001-11-08 13:35:13 (GMT)
committerMuQun Yang <ymuqun@hdfgroup.org>2001-11-08 13:35:13 (GMT)
commit7957dc20af11fd6b12c483634f7e447d2b363145 (patch)
treef2ffe0bc876d0aaedb8611ef45dea0368ebd6c97
parent55de078e47bf7837fc7ecff1ef8d4ff916e72fbf (diff)
downloadhdf5-7957dc20af11fd6b12c483634f7e447d2b363145.zip
hdf5-7957dc20af11fd6b12c483634f7e447d2b363145.tar.gz
hdf5-7957dc20af11fd6b12c483634f7e447d2b363145.tar.bz2
[svn-r4595]
Purpose: 1. temporarily fixed mtime test when daylight saving changes on windows. 2. move H5_inline defination for win32 to windows H5pubconf.h at H5private.h. Description: 1. the mtime test is not working when the daylight saving ends. Hard-coded back to the correct time. Need to find a universal solution later. 2. Move H5_inline defination for win32 at H5private.h into windows specificed H5pubconf.h so that windows maintenance can be more easy to handle. Solution: see above. Platforms tested: windows 2000, confirmed at Linux Red Hat 6.2.
-rw-r--r--src/H5Omtime.c5
-rw-r--r--src/H5private.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/H5Omtime.c b/src/H5Omtime.c
index ee19d56..5cd4ea6 100644
--- a/src/H5Omtime.c
+++ b/src/H5Omtime.c
@@ -154,7 +154,10 @@ H5O_mtime_decode(H5F_t UNUSED *f, const uint8_t *p,
ftime(&timebuffer);
tz = timebuffer.timezone;
- the_time -= tz * 60 - 3600 * _daylight;
+ /* daylight is not handled properly. Currently we just hard-code
+ the problem. */
+ the_time -= tz*60;
+ /*the_time -= tz * 60 - 3600 * _daylight;*/
}
#else
/*
diff --git a/src/H5private.h b/src/H5private.h
index f6f7b26..e9e3d20 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -144,11 +144,13 @@
inline is now in C but in the C99 standard and not the old C89 version so
MS doesn't recognize it yet (as of April 2001)
*/
+/*
#if defined(__MWERKS__) || defined(__cplusplus)
# define H5_inline inline
# else
# define H5_inline
#endif
+*/
#endif /*WIN32*/