diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-07-21 15:05:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-21 15:05:59 -0400 |
| commit | 8927f016e189ea61913cf9f20c9d61e6fa92fb95 (patch) | |
| tree | 20932bee9230cab7970c507f56cae703fa479ec2 /src/common/settings.cpp | |
| parent | c0202da9ac8301f86086ea898e6789dae981b13f (diff) | |
| parent | 63a0a1f826e7d7582025fb1550b2c4034bd45b48 (diff) | |
Merge pull request #11069 from lat9nq/mingw-no-tzdb
common: Use arithmetic instead of string ops to get time zone
Diffstat (limited to 'src/common/settings.cpp')
| -rw-r--r-- | src/common/settings.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 5972480e5..d4e55f988 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -26,7 +26,8 @@ std::string GetTimeZoneString() { std::string location_name; if (time_zone_index == 0) { // Auto -#if __cpp_lib_chrono >= 201907L +#if __cpp_lib_chrono >= 201907L && !defined(MINGW) + // Disabled for MinGW -- tzdb always returns Etc/UTC try { const struct std::chrono::tzdb& time_zone_data = std::chrono::get_tzdb(); const std::chrono::time_zone* current_zone = time_zone_data.current_zone(); |