diff options
author | Liam <byteslice@airmail.cc> | 2023-11-25 22:18:02 +0100 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2023-11-25 22:18:02 +0100 |
commit | e6847c65a867d4095a40e6cf13298a7a9c6d0286 (patch) | |
tree | 7d92f197c47f251b7d9d853ad5c6a33bfe9e2c0c /src/core/hle/service/time | |
parent | Merge pull request #12153 from liamwhite/deck2 (diff) | |
download | yuzu-e6847c65a867d4095a40e6cf13298a7a9c6d0286.tar yuzu-e6847c65a867d4095a40e6cf13298a7a9c6d0286.tar.gz yuzu-e6847c65a867d4095a40e6cf13298a7a9c6d0286.tar.bz2 yuzu-e6847c65a867d4095a40e6cf13298a7a9c6d0286.tar.lz yuzu-e6847c65a867d4095a40e6cf13298a7a9c6d0286.tar.xz yuzu-e6847c65a867d4095a40e6cf13298a7a9c6d0286.tar.zst yuzu-e6847c65a867d4095a40e6cf13298a7a9c6d0286.zip |
Diffstat (limited to 'src/core/hle/service/time')
-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 { |