diff options
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/service/time/time.cpp | 8 | ||||
| -rw-r--r-- | src/core/hle/service/time/time.h | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/core/hle/service/time/time.cpp b/src/core/hle/service/time/time.cpp index d312bd765..85e7b1195 100644 --- a/src/core/hle/service/time/time.cpp +++ b/src/core/hle/service/time/time.cpp | |||
| @@ -16,10 +16,13 @@ | |||
| 16 | namespace Service::Time { | 16 | namespace Service::Time { |
| 17 | 17 | ||
| 18 | static void PosixToCalendar(u64 posix_time, CalendarTime& calendar_time, | 18 | static void PosixToCalendar(u64 posix_time, CalendarTime& calendar_time, |
| 19 | CalendarAdditionalInfo& additional_info, const TimeZoneRule& /*rule*/) { | 19 | CalendarAdditionalInfo& additional_info, |
| 20 | [[maybe_unused]] const TimeZoneRule& /*rule*/) { | ||
| 20 | const std::time_t time(posix_time); | 21 | const std::time_t time(posix_time); |
| 21 | const std::tm* tm = std::localtime(&time); | 22 | const std::tm* tm = std::localtime(&time); |
| 22 | if (tm == nullptr) { | 23 | if (tm == nullptr) { |
| 24 | calendar_time = {}; | ||
| 25 | additional_info = {}; | ||
| 23 | return; | 26 | return; |
| 24 | } | 27 | } |
| 25 | calendar_time.year = tm->tm_year + 1900; | 28 | calendar_time.year = tm->tm_year + 1900; |
| @@ -35,7 +38,8 @@ static void PosixToCalendar(u64 posix_time, CalendarTime& calendar_time, | |||
| 35 | additional_info.utc_offset = 0; | 38 | additional_info.utc_offset = 0; |
| 36 | } | 39 | } |
| 37 | 40 | ||
| 38 | u64 CalendarToPosix(const CalendarTime& calendar_time, const TimeZoneRule& /*rule*/) { | 41 | static u64 CalendarToPosix(const CalendarTime& calendar_time, |
| 42 | [[maybe_unused]] const TimeZoneRule& /*rule*/) { | ||
| 39 | std::tm time{}; | 43 | std::tm time{}; |
| 40 | time.tm_year = calendar_time.year - 1900; | 44 | time.tm_year = calendar_time.year - 1900; |
| 41 | time.tm_mon = calendar_time.month - 1; | 45 | time.tm_mon = calendar_time.month - 1; |
diff --git a/src/core/hle/service/time/time.h b/src/core/hle/service/time/time.h index ca30ec60f..77871ae07 100644 --- a/src/core/hle/service/time/time.h +++ b/src/core/hle/service/time/time.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <array> | 7 | #include <array> |
| 8 | #include "common/common_funcs.h" | ||
| 8 | #include "core/hle/service/service.h" | 9 | #include "core/hle/service/service.h" |
| 9 | 10 | ||
| 10 | namespace Service::Time { | 11 | namespace Service::Time { |