diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-05-08 01:22:24 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-05-08 22:46:34 +0000 |
| commit | 0fcedcd17cc00d3dd44c718b3cb36c1033319671 (patch) | |
| tree | a794dff3274695e99c651902dde93d934ea7a5af /Source/JavaScriptCore/runtime/DateConversion.cpp | |
| parent | 6469f308c0f0f710544d7d55c7655384bed27795 (diff) | |
| download | qtwebkit-0fcedcd17cc00d3dd44c718b3cb36c1033319671.tar.gz | |
Import WebKit commit b25ce6eca994718717218f56d045e75a4a22f989wip/next
Change-Id: Ied338d9a16b44b5da35d484e80a21acc284eb625
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/JavaScriptCore/runtime/DateConversion.cpp')
| -rw-r--r-- | Source/JavaScriptCore/runtime/DateConversion.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp index 0b57f012d..05e27338b 100644 --- a/Source/JavaScriptCore/runtime/DateConversion.cpp +++ b/Source/JavaScriptCore/runtime/DateConversion.cpp @@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as #if OS(WINDOWS) TIME_ZONE_INFORMATION timeZoneInformation; GetTimeZoneInformation(&timeZoneInformation); - const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; + const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; + String timeZoneName(reinterpret_cast<const UChar*>(winTimeZoneName)); #else struct tm gtm = t; char timeZoneName[70]; |