diff options
| author | Fredrik Gustafsson <[email protected]> | 2012-08-27 14:57:57 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2012-08-27 14:57:57 +0200 |
| commit | c6fc61ffab426cc7b391eb903e7942bda809a230 (patch) | |
| tree | 27ae3dcefdd676c115c7fb77ac1d87b6891a7c76 /erts | |
| parent | 5d2e66f48c9be7e67e38977d8f88f737f60dfc54 (diff) | |
| parent | 904384397517ded1e9d2e3b1c6fdf16eeb2dab67 (diff) | |
| download | otp-c6fc61ffab426cc7b391eb903e7942bda809a230.tar.gz otp-c6fc61ffab426cc7b391eb903e7942bda809a230.tar.bz2 otp-c6fc61ffab426cc7b391eb903e7942bda809a230.zip | |
Merge branch 'psi/fix-leap-seconds/OTP-10227' into maint
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/configure.in | 5 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_time_sup.c | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/erts/configure.in b/erts/configure.in index 281f61f86e..8d70a1b74a 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -1882,9 +1882,10 @@ AC_CHECK_FUNCS([ieee_handler fpsetmask finite isnan isinf res_gethostbyname dlop pread pwrite writev memmove strerror strerror_r strncasecmp \ gethrtime localtime_r gmtime_r inet_pton mmap mremap memcpy mallopt \ sbrk _sbrk __sbrk brk _brk __brk \ - flockfile fstat strlcpy strlcat setsid posix2time setlocale nl_langinfo poll]) + flockfile fstat strlcpy strlcat setsid posix2time time2posix \ + setlocale nl_langinfo poll]) -AC_CHECK_DECLS([posix2time],,,[#include <time.h>]) +AC_CHECK_DECLS([posix2time, time2posix],,,[#include <time.h>]) disable_vfork=false if test "x$EMU_THR_LIB_NAME" != "x"; then diff --git a/erts/emulator/beam/erl_time_sup.c b/erts/emulator/beam/erl_time_sup.c index e6962a700b..f90daadadc 100644 --- a/erts/emulator/beam/erl_time_sup.c +++ b/erts/emulator/beam/erl_time_sup.c @@ -717,6 +717,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) @@ -766,6 +771,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 |