diff options
author | Patrick Hurst <phurst@mit.edu> | 2014-02-14 04:00:03 -0500 |
---|---|---|
committer | Patrick Hurst <phurst@mit.edu> | 2014-02-14 04:00:03 -0500 |
commit | 946bb6b8dc7c7e5cfd4021cda1102a7819f6f8ad (patch) | |
tree | 33bd2d11b2a2be4e188ac79abcdbfa4df2e2d199 /src/c/urweb.c | |
parent | db4c5117972ea2dae676b7af00622db72e5cd465 (diff) | |
parent | 9d1eacaab495588439dfc5cb25b6e495bce332c1 (diff) |
Merge in upstream
Diffstat (limited to 'src/c/urweb.c')
-rw-r--r-- | src/c/urweb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/c/urweb.c b/src/c/urweb.c index 4eb542df..7ff8a262 100644 --- a/src/c/urweb.c +++ b/src/c/urweb.c @@ -3933,7 +3933,7 @@ uw_Basis_int uw_Basis_toSeconds(uw_context ctx, uw_Basis_time tm) { uw_Basis_time uw_Basis_fromDatetime(uw_context ctx, uw_Basis_int year, uw_Basis_int month, uw_Basis_int day, uw_Basis_int hour, uw_Basis_int minute, uw_Basis_int second) { struct tm tm = { .tm_year = year - 1900, .tm_mon = month, .tm_mday = day, .tm_hour = hour, .tm_min = minute, .tm_sec = second }; - uw_Basis_time r = { timegm(&tm) }; + uw_Basis_time r = { timelocal(&tm) }; return r; } |