diff options
| author | Max Kellermann <max@musicpd.org> | 2020-03-17 16:59:21 +0100 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2020-04-01 16:21:29 +0200 |
| commit | 672bc3ab671e59691cbafdb48a71f38ed3735b04 (patch) | |
| tree | ed3a0e563c98d5a2c5ed67a5be9b9685fb136199 | |
| parent | 62229f14da8d7794f73491c28db47fd9e1c25b3f (diff) | |
time/Convert: fix GetTimeZoneOffset() on Windows
Was using the wrong parameter.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | src/time/Convert.cxx | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -9,6 +9,8 @@ ver 0.21.22 (not yet released) - android: new mixer plugin for "sles" output * Android - TV support +* Windows + - fix time zone offset check * fix build failures with uClibc-ng ver 0.21.21 (2020/03/19) diff --git a/src/time/Convert.cxx b/src/time/Convert.cxx index 2351f4b52..352c60604 100644 --- a/src/time/Convert.cxx +++ b/src/time/Convert.cxx @@ -77,15 +77,15 @@ static time_t GetTimeZoneOffset() noexcept { time_t t = 1234567890; - struct tm tm; - tm.tm_isdst = 0; #ifdef _WIN32 struct tm *p = gmtime(&t); #else + struct tm tm; + tm.tm_isdst = 0; struct tm *p = &tm; gmtime_r(&t, p); #endif - return t - mktime(&tm); + return t - mktime(p); } #endif /* !__GLIBC__ */ |