diff options
| author |  Liam | 2023-11-25 16:18:02 -0500 |
|---|---|---|
| committer | Liam | 2023-11-25 16:18:02 -0500 |
| commit | e6847c65a867d4095a40e6cf13298a7a9c6d0286 (patch) | |
| tree | 7d92f197c47f251b7d9d853ad5c6a33bfe9e2c0c | |
| parent | Merge pull request #12153 from liamwhite/deck2 (diff) | |
| download | yuzu-e6847c65a867d4095a40e6cf13298a7a9c6d0286.tar.gz yuzu-e6847c65a867d4095a40e6cf13298a7a9c6d0286.tar.xz yuzu-e6847c65a867d4095a40e6cf13298a7a9c6d0286.zip | |
time: undef GetCurrentTime for Windows
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/service/time/clock_types.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/hle/service/time/clock_types.h b/src/core/hle/service/time/clock_types.h index 9fc01ea90..7149fffeb 100644 --- a/src/core/hle/service/time/clock_types.h +++ b/src/core/hle/service/time/clock_types.h | |||
| @@ -11,6 +11,11 @@ | |||
| 11 | #include "core/hle/service/time/errors.h" | 11 | #include "core/hle/service/time/errors.h" |
| 12 | #include "core/hle/service/time/time_zone_types.h" | 12 | #include "core/hle/service/time/time_zone_types.h" |
| 13 | 13 | ||
| 14 | // Defined by WinBase.h on Windows | ||
| 15 | #ifdef GetCurrentTime | ||
| 16 | #undef GetCurrentTime | ||
| 17 | #endif | ||
| 18 | |||
| 14 | namespace Service::Time::Clock { | 19 | namespace Service::Time::Clock { |
| 15 | 20 | ||
| 16 | enum class TimeType : u8 { | 21 | enum class TimeType : u8 { |