aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2012-08-27 14:58:10 +0200
committerFredrik Gustafsson <[email protected]>2012-08-27 14:58:10 +0200
commitfc5a483902f56839b5e331d5362c66cc6d35bed9 (patch)
treee3668b8f4e6b7bdcd8b423d9f3ba8ffd9342461d /erts/emulator
parent38d0c706e0ab69a58ca07c35c9d307e9a405f003 (diff)
parentc6fc61ffab426cc7b391eb903e7942bda809a230 (diff)
downloadotp-fc5a483902f56839b5e331d5362c66cc6d35bed9.tar.gz
otp-fc5a483902f56839b5e331d5362c66cc6d35bed9.tar.bz2
otp-fc5a483902f56839b5e331d5362c66cc6d35bed9.zip
Merge branch 'maint'
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_time_sup.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_time_sup.c b/erts/emulator/beam/erl_time_sup.c
index 05cbdfc7e5..e57e6a250d 100644
--- a/erts/emulator/beam/erl_time_sup.c
+++ b/erts/emulator/beam/erl_time_sup.c
@@ -754,6 +754,11 @@ int univ_to_seconds(Sint year, Sint month, Sint day, Sint hour, Sint minute, Sin
return 1;
}
+#if defined(HAVE_TIME2POSIX) && defined(HAVE_DECL_TIME2POSIX) && \
+ !HAVE_DECL_TIME2POSIX
+extern time_t time2posix(time_t);
+#endif
+
int
local_to_univ(Sint *year, Sint *month, Sint *day,
Sint *hour, Sint *minute, Sint *second, int isdst)
@@ -803,6 +808,11 @@ local_to_univ(Sint *year, Sint *month, Sint *day,
return 0;
}
}
+
+#ifdef HAVE_TIME2POSIX
+ the_clock = time2posix(the_clock);
+#endif
+
#ifdef HAVE_GMTIME_R
tm = gmtime_r(&the_clock, &tmbuf);
#else