From 305e8c009c420bbadfef0478742d1e7111491599 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Wed, 8 Jul 2015 19:28:28 -0700 Subject: [PATCH] GBA Hardware: Use localtime_s on Win32 and PSP2 --- src/gba/hardware.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/gba/hardware.c b/src/gba/hardware.c index d764325fd..c9c3bec30 100644 --- a/src/gba/hardware.c +++ b/src/gba/hardware.c @@ -8,10 +8,6 @@ #include "gba/serialize.h" #include "util/hash.h" -#ifdef PSP2 -#include -#endif - static void _readPins(struct GBACartridgeHardware* hw); static void _outputPins(struct GBACartridgeHardware* hw, unsigned pins); @@ -260,12 +256,8 @@ void _rtcUpdateClock(struct GBACartridgeHardware* hw) { t = time(0); } struct tm date; -#ifdef _WIN32 - date = *localtime(&t); -#elif defined(PSP2) - SceRtcTime scertc; - sceRtcGetCurrentClockLocalTime(&scertc); - sceRtcGetTime_t(&scertc, &t); +#if defined(_WIN32) || defined(PSP2) + localtime_s(&date, &t); #else localtime_r(&t, &date); #endif