Merge branch 'master' of https://github.com/gabime/spdlog

2015-11-26 14:51:07 +02:00
parent 7b3fc4ba97 b187976141
commit 2e46ba9f98
1 changed files with 5 additions and 0 deletions
--- a/include/spdlog/details/os.h
+++ b/include/spdlog/details/os.h
@@ -166,8 +166,13 @@ inline int utc_minutes_offset(const std::tm& tm = details::os::localtime())

 #ifdef _WIN32
    (void)tm; // avoid unused param warning
+#if _WIN32_WINNT < _WIN32_WINNT_WS08
+	TIME_ZONE_INFORMATION tzinfo;
+	auto rv = GetTimeZoneInformation(&tzinfo);
+#else
    DYNAMIC_TIME_ZONE_INFORMATION tzinfo;
    auto rv = GetDynamicTimeZoneInformation(&tzinfo);
+#endif
    if (!rv)
        return -1;
    return -1 * (tzinfo.Bias + tzinfo.DaylightBias);