Merge pull request #12169 from liamwhite/its-time-to-stop
time: undef GetCurrentTime for Windows
This commit is contained in:
commit
8d7a55be5b
@ -11,6 +11,11 @@
|
|||||||
#include "core/hle/service/time/errors.h"
|
#include "core/hle/service/time/errors.h"
|
||||||
#include "core/hle/service/time/time_zone_types.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 {
|
namespace Service::Time::Clock {
|
||||||
|
|
||||||
enum class TimeType : u8 {
|
enum class TimeType : u8 {
|
||||||
|
Loading…
Reference in New Issue
Block a user