aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorFredrik Gustafsson <fredrik@erlang.org>2012-08-20 17:01:43 +0200
committerFredrik Gustafsson <fredrik@erlang.org>2012-08-20 17:01:43 +0200
commit786122a8cb40fbf9cb7357071c1bf13bf51e7f3c (patch)
tree74b5af2f8e65cc320026e98ce6f060d3c8eff827 /erts
parent2a017b471cb2096eccf2f908f38a7a5305901788 (diff)
parent99f6356e35b89446487bcdd787ed9b0657ae6b71 (diff)
downloadotp-786122a8cb40fbf9cb7357071c1bf13bf51e7f3c.tar.gz
otp-786122a8cb40fbf9cb7357071c1bf13bf51e7f3c.tar.bz2
otp-786122a8cb40fbf9cb7357071c1bf13bf51e7f3c.zip
Merge branch 'psi/fix-clever-mktime/OTP-10187' into maint
* psi/fix-clever-mktime/OTP-10187: Fix use of "clever" mktime
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/erl_time_sup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_time_sup.c b/erts/emulator/beam/erl_time_sup.c
index 1d0735aa99..e6962a700b 100644
--- a/erts/emulator/beam/erl_time_sup.c
+++ b/erts/emulator/beam/erl_time_sup.c
@@ -757,7 +757,7 @@ local_to_univ(Sint *year, Sint *month, Sint *day,
refuses to give us a DST time, we simulate the Linux/Solaris
behaviour of giving the same data as if is_dst was not set. */
t.tm_isdst = 0;
- if (erl_mktime(&the_clock, &t)) {
+ if (erl_mktime(&the_clock, &t) < 0) {
/* Failed anyway, something else is bad - will be a badarg */
return 0;
}