Complete fix for windows compilability
Thanks @volzhs for testing :)
This commit is contained in:
parent
64704ecbc5
commit
ddba217109
2 changed files with 4 additions and 2 deletions
|
@ -1863,9 +1863,10 @@ OS::Time OS_Windows::get_time(bool utc) const {
|
||||||
OS::TimeZoneInfo OS_Windows::get_time_zone_info() const {
|
OS::TimeZoneInfo OS_Windows::get_time_zone_info() const {
|
||||||
TIME_ZONE_INFORMATION info;
|
TIME_ZONE_INFORMATION info;
|
||||||
bool daylight = false;
|
bool daylight = false;
|
||||||
if (GetTimeZoneInformation(info) == TIME_ZONE_ID_DAYLIGHT)
|
if (GetTimeZoneInformation(&info) == TIME_ZONE_ID_DAYLIGHT)
|
||||||
daylight = true;
|
daylight = true;
|
||||||
|
|
||||||
|
TimeZoneInfo ret;
|
||||||
if (daylight) {
|
if (daylight) {
|
||||||
ret.name = info.DaylightName;
|
ret.name = info.DaylightName;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -476,9 +476,10 @@ OS::Time OSWinrt::get_time(bool utc) const {
|
||||||
OS::TimeZoneInfo OS_Windows::get_time_zone_info() const {
|
OS::TimeZoneInfo OS_Windows::get_time_zone_info() const {
|
||||||
TIME_ZONE_INFORMATION info;
|
TIME_ZONE_INFORMATION info;
|
||||||
bool daylight = false;
|
bool daylight = false;
|
||||||
if (GetTimeZoneInformation(info) == TIME_ZONE_ID_DAYLIGHT)
|
if (GetTimeZoneInformation(&info) == TIME_ZONE_ID_DAYLIGHT)
|
||||||
daylight = true;
|
daylight = true;
|
||||||
|
|
||||||
|
TimeZoneInfo ret;
|
||||||
if (daylight) {
|
if (daylight) {
|
||||||
ret.name = info.DaylightName;
|
ret.name = info.DaylightName;
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue