diff options
| author |  Derek Mauro <761129+derekmauro@users.noreply.github.com> | 2023-08-07 14:40:00 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-08-07 14:40:00 -0400 |
| commit | 29bf8085f3bf17b84d30e34b3d7ff8248fda404e (patch) | |
| tree | 68e46ad8061fb2f3711ff349c73a0d31e73b32ee | |
| parent | d583a5972641374d3b88b29d919ecd1b22b14ddd (diff) | |
Cherry pick CCTZ fix for MinGW (#1508)20230802.rc220230802.0
| -rw-r--r-- | absl/time/internal/cctz/src/time_zone_lookup.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/absl/time/internal/cctz/src/time_zone_lookup.cc b/absl/time/internal/cctz/src/time_zone_lookup.cc index 9a30ba5e..d22691bd 100644 --- a/absl/time/internal/cctz/src/time_zone_lookup.cc +++ b/absl/time/internal/cctz/src/time_zone_lookup.cc @@ -39,7 +39,12 @@ #include <sdkddkver.h> // Include only when the SDK is for Windows 10 (and later), and the binary is // targeted for Windows XP and later. -#if defined(_WIN32_WINNT_WIN10) && (_WIN32_WINNT >= _WIN32_WINNT_WINXP) +// Note: The Windows SDK added windows.globalization.h file for Windows 10, but +// MinGW did not add it until NTDDI_WIN10_NI (SDK version 10.0.22621.0). +#if ((defined(_WIN32_WINNT_WIN10) && !defined(__MINGW32__)) || \ + (defined(NTDDI_WIN10_NI) && NTDDI_VERSION >= NTDDI_WIN10_NI)) && \ + (_WIN32_WINNT >= _WIN32_WINNT_WINXP) +#define USE_WIN32_LOCAL_TIME_ZONE #include <roapi.h> #include <tchar.h> #include <wchar.h> @@ -87,7 +92,7 @@ int __system_property_get(const char* name, char* value) { } #endif -#if defined(_WIN32_WINNT_WIN10) && (_WIN32_WINNT >= _WIN32_WINNT_WINXP) +#if defined(USE_WIN32_LOCAL_TIME_ZONE) // Calls the WinRT Calendar.GetTimeZone method to obtain the IANA ID of the // local time zone. Returns an empty vector in case of an error. std::string win32_local_time_zone(const HMODULE combase) { @@ -278,7 +283,7 @@ time_zone local_time_zone() { zone = primary_tz.c_str(); } #endif -#if defined(_WIN32_WINNT_WIN10) && (_WIN32_WINNT >= _WIN32_WINNT_WINXP) +#if defined(USE_WIN32_LOCAL_TIME_ZONE) // Use the WinRT Calendar class to get the local time zone. This feature is // available on Windows 10 and later. The library is dynamically linked to // maintain binary compatibility with Windows XP - Windows 7. On Windows 8, |