summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorScott Wegner <swegner@hdfgroup.org>2008-06-09 18:41:29 (GMT)
committerScott Wegner <swegner@hdfgroup.org>2008-06-09 18:41:29 (GMT)
commit7a92820e35582fc94f0dd46e5039547fddd3d98d (patch)
tree4edab170ada903be86940f82c306a2aa738afcb8 /src
parenta97fa671eb16f7b12ed87c46c86501d0282aa364 (diff)
downloadhdf5-7a92820e35582fc94f0dd46e5039547fddd3d98d.zip
hdf5-7a92820e35582fc94f0dd46e5039547fddd3d98d.tar.gz
hdf5-7a92820e35582fc94f0dd46e5039547fddd3d98d.tar.bz2
[svn-r15183] Purpose: _WIN32 macro cleanup
Description: As part of our Windows cleanup, we try to remove windows-specific tweaks in the source code. There are many instances where Windows code is introduces via ifdef's. We re-evaluate whether they are still required, and found that many of them are not. Others we change to "feature"-specific code, rather than Windows-specific. Tested: VS2005 on WinXP VS.NET on WinXP h5committest (kagisopp, smirom, linew)
Diffstat (limited to 'src')
-rw-r--r--src/H5Omtime.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/src/H5Omtime.c b/src/H5Omtime.c
index 0a70e5b..df4bdd4 100644
--- a/src/H5Omtime.c
+++ b/src/H5Omtime.c
@@ -27,11 +27,6 @@
#include "H5MMprivate.h" /* Memory management */
#include "H5Opkg.h" /* Object headers */
-#if defined (_WIN32) && !defined (__MWERKS__)
-#include <sys/types.h>
-#include <sys/timeb.h>
-#endif
-
static void *H5O_mtime_new_decode(H5F_t *f, hid_t dxpl_id, unsigned mesg_flags, const uint8_t *p);
static herr_t H5O_mtime_new_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
@@ -247,24 +242,7 @@ H5O_mtime_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, unsigned UNUSED mesg_fla
the_time -= tz.tz_minuteswest * 60 - (tm.tm_isdst ? 3600 : 0);
}
-#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 - 3600;
- }
- #else /*__MWERKS__*/
-
- ;
-
- #endif /*__MWERKS__*/
-#else /* _WIN32 */
+#else
/*
* 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