Core: try not to break systems without tm_gmtoff

hrydgard · May 26, 2015 · ac436fc · ac436fc
1 parent ea959b1
commit ac436fc
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/Core/HLE/sceRtc.cpp b/Core/HLE/sceRtc.cpp
@@ -459,14 +459,14 @@ static int sceRtcConvertLocalTimeToUTC(u32 tickLocalPtr,u32 tickUTCPtr)
 	{
 		u64 srcTick = Memory::Read_U64(tickLocalPtr);
 		// TODO : Let the user select his timezone / daylight saving instead of taking system param ?
-#ifndef _MSC_VER
-		time_t timezone = 0;
-		tm *time = localtime(&timezone);
-		srcTick -= time->tm_gmtoff*1000000ULL;
-#else
+#ifdef _MSC_VER
 		long timezone_val;
 		_get_timezone(&timezone_val);
 		srcTick -= -timezone_val * 1000000ULL;
+#elif !defined(_AIX) && !defined(__sgi) && !defined(__hpux)
+		time_t timezone = 0;
+		tm *time = localtime(&timezone);
+		srcTick -= time->tm_gmtoff*1000000ULL;
 #endif
 		Memory::Write_U64(srcTick, tickUTCPtr);
 	}
@@ -484,14 +484,14 @@ static int sceRtcConvertUtcToLocalTime(u32 tickUTCPtr,u32 tickLocalPtr)
 	{
 		u64 srcTick = Memory::Read_U64(tickUTCPtr);
 		// TODO : Let the user select his timezone / daylight saving instead of taking system param ?
-#ifndef _MSC_VER
-		time_t timezone = 0;
-		tm *time = localtime(&timezone);
-		srcTick += time->tm_gmtoff*1000000ULL;
-#else
+#ifdef _MSC_VER
 		long timezone_val;
 		_get_timezone(&timezone_val);
 		srcTick += -timezone_val * 1000000ULL;
+#elif !defined(_AIX) && !defined(__sgi) && !defined(__hpux)
+		time_t timezone = 0;
+		tm *time = localtime(&timezone);
+		srcTick += time->tm_gmtoff*1000000ULL;
 #endif
 		Memory::Write_U64(srcTick, tickLocalPtr);
 	}
@@ -1019,14 +1019,14 @@ static int sceRtcFormatRFC2822LocalTime(u32 outPtr, u32 srcTickPtr)
 	}
 
 	int tz_seconds;
-#ifndef _MSC_VER
-		time_t timezone = 0;
-		tm *time = localtime(&timezone);
-		tz_seconds = time->tm_gmtoff;
-#else
+#ifdef _MSC_VER
 		long timezone_val;
 		_get_timezone(&timezone_val);
 		tz_seconds = -timezone_val;
+#elif !defined(_AIX) && !defined(__sgi) && !defined(__hpux)
+		time_t timezone = 0;
+		tm *time = localtime(&timezone);
+		tz_seconds = time->tm_gmtoff;
 #endif
 
 	DEBUG_LOG(SCERTC, "sceRtcFormatRFC2822LocalTime(%08x, %08x)", outPtr, srcTickPtr);
@@ -1056,14 +1056,14 @@ static int sceRtcFormatRFC3339LocalTime(u32 outPtr, u32 srcTickPtr)
 	}
 
 	int tz_seconds;
-#ifndef _MSC_VER
-		time_t timezone = 0;
-		tm *time = localtime(&timezone);
-		tz_seconds = time->tm_gmtoff;
-#else
+#ifdef _MSC_VER
 		long timezone_val;
 		_get_timezone(&timezone_val);
 		tz_seconds = -timezone_val;
+#elif !defined(_AIX) && !defined(__sgi) && !defined(__hpux)
+		time_t timezone = 0;
+		tm *time = localtime(&timezone);
+		tz_seconds = time->tm_gmtoff;
 #endif
 
 	DEBUG_LOG(SCERTC, "sceRtcFormatRFC3339LocalTime(%08x, %08x)", outPtr, srcTickPtr);