diff src/c/urweb.c @ 1984:819756825c8d

Merge in upstream
author Patrick Hurst <phurst@mit.edu>
date Fri, 14 Feb 2014 04:00:03 -0500
parents 2b95ecdd94eb
children 7075acda4456
line wrap: on
line diff
--- a/src/c/urweb.c	Wed Jan 29 18:29:43 2014 -0500
+++ b/src/c/urweb.c	Fri Feb 14 04:00:03 2014 -0500
@@ -3933,7 +3933,7 @@
 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;
 }