summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-01-29 22:33:01 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-01-29 22:33:01 (GMT)
commitda2a2d940057ad7c5c224bdc00035d867725e9a1 (patch)
tree451beca7916508d44eca234673ca3e8ebbf554d2 /src
parent5bf140387f08a9395768acfd48e20abe0d3c6b49 (diff)
downloadhdf5-da2a2d940057ad7c5c224bdc00035d867725e9a1.zip
hdf5-da2a2d940057ad7c5c224bdc00035d867725e9a1.tar.gz
hdf5-da2a2d940057ad7c5c224bdc00035d867725e9a1.tar.bz2
[svn-r26079] Removed obsolete HAVE___TM_GMTOFF defines. This is an artifact of the Linux
fork of glibc. It's been deprecated since at least 1997. Part of HDFFV-9085 Tested on: jam
Diffstat (limited to 'src')
-rw-r--r--src/H5Omtime.c9
-rw-r--r--src/H5config.h.in3
2 files changed, 3 insertions, 9 deletions
diff --git a/src/H5Omtime.c b/src/H5Omtime.c
index a983ca4..c9375f9 100644
--- a/src/H5Omtime.c
+++ b/src/H5Omtime.c
@@ -222,14 +222,11 @@ H5O_mtime_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "badly formatted modification time message")
#if defined(H5_HAVE_TM_GMTOFF)
- /* FreeBSD, OSF 4.0 */
+ /* BSD-like systems */
the_time += tm.tm_gmtoff;
-#elif defined(H5_HAVE___TM_GMTOFF)
- /* Linux libc-4 */
- the_time += tm.__tm_gmtoff;
#elif defined(H5_HAVE_TIMEZONE)
- /* Linux libc-5 */
- the_time -= timezone - (tm.tm_isdst?3600:0);
+ /* GNU/Linux systems */
+ the_time -= timezone - (tm.tm_isdst ? 3600 : 0);
#else
/*
* The catch-all. If we can't convert a character string universal
diff --git a/src/H5config.h.in b/src/H5config.h.in
index 74a3671..119763f 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -381,9 +381,6 @@
/* Define to 1 if you have the `_scrsize' function. */
#undef HAVE__SCRSIZE
-/* Define if `__tm_gmtoff' is a member of `struct tm' */
-#undef HAVE___TM_GMTOFF
-
/* Define if your system can't handle converting floating-point values to long
long. */
#undef HW_FP_TO_LLONG_NOT_WORKS