diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-11-26 02:56:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-26 02:56:31 +0100 |
| commit | 8d7a55be5b033d0e2a33e268c2894fbed65f4400 (patch) | |
| tree | 7d92f197c47f251b7d9d853ad5c6a33bfe9e2c0c | |
| parent | Merge pull request #12153 from liamwhite/deck2 (diff) | |
| parent | time: undef GetCurrentTime for Windows (diff) | |
| download | yuzu-8d7a55be5b033d0e2a33e268c2894fbed65f4400.tar yuzu-8d7a55be5b033d0e2a33e268c2894fbed65f4400.tar.gz yuzu-8d7a55be5b033d0e2a33e268c2894fbed65f4400.tar.bz2 yuzu-8d7a55be5b033d0e2a33e268c2894fbed65f4400.tar.lz yuzu-8d7a55be5b033d0e2a33e268c2894fbed65f4400.tar.xz yuzu-8d7a55be5b033d0e2a33e268c2894fbed65f4400.tar.zst yuzu-8d7a55be5b033d0e2a33e268c2894fbed65f4400.zip | |
| -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 @@ #include "core/hle/service/time/errors.h" #include "core/hle/service/time/time_zone_types.h" +// Defined by WinBase.h on Windows +#ifdef GetCurrentTime +#undef GetCurrentTime +#endif + namespace Service::Time::Clock { enum class TimeType : u8 { |