diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-11-25 20:56:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-25 20:56:31 -0500 |
| commit | 8d7a55be5b033d0e2a33e268c2894fbed65f4400 (patch) | |
| tree | 7d92f197c47f251b7d9d853ad5c6a33bfe9e2c0c | |
| parent | 090ea0281c34bd8d4932c9dc7ef24da5e9e35759 (diff) | |
| parent | e6847c65a867d4095a40e6cf13298a7a9c6d0286 (diff) | |
Merge pull request #12169 from liamwhite/its-time-to-stop
time: undef GetCurrentTime for Windows
| -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 { |