summaryrefslogtreecommitdiff
path: root/lib/timegm.c
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-02-11 18:04:53 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-02-11 18:04:53 +0000
commit309766063aa4e3c873defe5c472ee53245168b9f (patch)
treeb18b03313a00d21b7bd33ad41fba48cc73dc05b2 /lib/timegm.c
parent30ed4f400f979adade61ca362377502464bee47a (diff)
parentc280370fa3ef304b9adc9d3cf36c9aeec27034e4 (diff)
downloadxine-lib-309766063aa4e3c873defe5c472ee53245168b9f.tar.gz
xine-lib-309766063aa4e3c873defe5c472ee53245168b9f.tar.bz2
Merge from 1.1.
Diffstat (limited to 'lib/timegm.c')
-rw-r--r--lib/timegm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/timegm.c b/lib/timegm.c
index 588131afb..e86e66370 100644
--- a/lib/timegm.c
+++ b/lib/timegm.c
@@ -5,15 +5,19 @@
time_t xine_private_timegm(struct tm *tm) {
time_t ret;
+#if defined(HAVE_TZSET)
char *tz;
tz = getenv("TZ");
setenv("TZ", "", 1);
tzset();
+#endif
ret = mktime(tm);
+#if defined(HAVE_TZSET)
if (tz) setenv("TZ", tz, 1);
else unsetenv("TZ");
tzset();
+#endif
return ret;
}