diff options
| author | Scott Wegner <swegner@hdfgroup.org> | 2008-06-09 17:31:22 (GMT) |
|---|---|---|
| committer | Scott Wegner <swegner@hdfgroup.org> | 2008-06-09 17:31:22 (GMT) |
| commit | 6df2bbd6e93c8731ac5c7a39f32090487b9061f5 (patch) | |
| tree | fdaced2c64e3c5f2428f6ef02022f48f37989905 /src | |
| parent | 0304c9a5fa3aca4331505e36c939f0347acf0132 (diff) | |
| download | hdf5-6df2bbd6e93c8731ac5c7a39f32090487b9061f5.zip hdf5-6df2bbd6e93c8731ac5c7a39f32090487b9061f5.tar.gz hdf5-6df2bbd6e93c8731ac5c7a39f32090487b9061f5.tar.bz2 | |
[svn-r15181] 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.c | 24 |
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 |