diff --git a/BasiliskII/ChangeLog b/BasiliskII/ChangeLog index 756c7d62..452a11ff 100644 --- a/BasiliskII/ChangeLog +++ b/BasiliskII/ChangeLog @@ -1,5 +1,6 @@ V0.8 - - Unix/video_x.cpp: new window refresh code [Samuel Lander] + - Unix/timer_unix.cpp: fixed time zone handling under Linux and SVR4 V0.8 (release 0.8-1) - 30.Jan.2000 - extfs: extended size of finf helper files to 32 bytes to eventually diff --git a/BasiliskII/src/Unix/sys_unix.cpp b/BasiliskII/src/Unix/sys_unix.cpp index 78e728e2..daa6e0c3 100644 --- a/BasiliskII/src/Unix/sys_unix.cpp +++ b/BasiliskII/src/Unix/sys_unix.cpp @@ -25,9 +25,9 @@ #include #ifdef __linux__ +#include #include #include -#include #include #include #include diff --git a/BasiliskII/src/Unix/timer_unix.cpp b/BasiliskII/src/Unix/timer_unix.cpp index 5d5947d3..82b24607 100644 --- a/BasiliskII/src/Unix/timer_unix.cpp +++ b/BasiliskII/src/Unix/timer_unix.cpp @@ -54,10 +54,7 @@ uint32 TimerDateTime(void) { time_t utc_now = time(NULL); #if defined(__linux__) || defined(__SVR4) - long tz = timezone; - time_t local_now = utc_now - tz; - if (daylight) - local_now += 3600; + time_t local_now = utc_now - timezone; #elif defined(__FreeBSD__) || defined(__NetBSD__) time_t local_now = utc_now + localtime(&utc_now)->tm_gmtoff; #else