Skip to content
Browse files

Merge branch 'psi/fix-clever-mktime/OTP-10187' into maint

* psi/fix-clever-mktime/OTP-10187:
  Fix use of "clever" mktime
  • Loading branch information...
2 parents 2a017b4 + 99f6356 commit 786122a8cb40fbf9cb7357071c1bf13bf51e7f3c @gustehn gustehn committed Aug 20, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 erts/emulator/beam/erl_time_sup.c
View
2 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;
}

0 comments on commit 786122a

Please sign in to comment.
Something went wrong with that request. Please try again.