godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2044 from est31/fix-win 

Complete fix for windows compilability
This commit is contained in:
Juan Linietsky 2015-06-07 11:25:14 -03:00
parent a30b2bf5df ddba217109
commit 798b55df30
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/windows/os_windows.cpp
View File

@ -1863,9 +1863,10 @@ OS::Time OS_Windows::get_time(bool utc) const {
OS::TimeZoneInfo OS_Windows::get_time_zone_info() const {
TIME_ZONE_INFORMATION info;
bool daylight = false;
if (GetTimeZoneInformation(info) == TIME_ZONE_ID_DAYLIGHT)
if (GetTimeZoneInformation(&info) == TIME_ZONE_ID_DAYLIGHT)
daylight = true;
TimeZoneInfo ret;
if (daylight) {
ret.name = info.DaylightName;
} else {

3
platform/winrt/os_winrt.cpp
View File

@ -476,9 +476,10 @@ OS::Time OSWinrt::get_time(bool utc) const {
OS::TimeZoneInfo OS_Windows::get_time_zone_info() const {
TIME_ZONE_INFORMATION info;
bool daylight = false;
if (GetTimeZoneInformation(info) == TIME_ZONE_ID_DAYLIGHT)
if (GetTimeZoneInformation(&info) == TIME_ZONE_ID_DAYLIGHT)
daylight = true;
TimeZoneInfo ret;
if (daylight) {
ret.name = info.DaylightName;
} else {