Browse Source

Merge pull request #2044 from est31/fix-win

Complete fix for windows compilability
Juan Linietsky 10 years ago
parent
commit
798b55df30
2 changed files with 4 additions and 2 deletions
  1. 2 1
      platform/windows/os_windows.cpp
  2. 2 1
      platform/winrt/os_winrt.cpp

+ 2 - 1
platform/windows/os_windows.cpp

@@ -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 {

+ 2 - 1
platform/winrt/os_winrt.cpp

@@ -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 {