summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar liamwhite2023-11-25 20:56:31 -0500
committerGravatar GitHub2023-11-25 20:56:31 -0500
commit8d7a55be5b033d0e2a33e268c2894fbed65f4400 (patch)
tree7d92f197c47f251b7d9d853ad5c6a33bfe9e2c0c /src
parentMerge pull request #12153 from liamwhite/deck2 (diff)
parenttime: undef GetCurrentTime for Windows (diff)
downloadyuzu-8d7a55be5b033d0e2a33e268c2894fbed65f4400.tar.gz
yuzu-8d7a55be5b033d0e2a33e268c2894fbed65f4400.tar.xz
yuzu-8d7a55be5b033d0e2a33e268c2894fbed65f4400.zip
Merge pull request #12169 from liamwhite/its-time-to-stop
time: undef GetCurrentTime for Windows
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/time/clock_types.h5
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
14namespace Service::Time::Clock { 19namespace Service::Time::Clock {
15 20
16enum class TimeType : u8 { 21enum class TimeType : u8 {