From 55edba512f78d65e8c612b9b9a2e964a05d7561d Mon Sep 17 00:00:00 2001 From: James Benton Date: Mon, 18 Jun 2018 10:04:27 +0100 Subject: [PATCH] Fix circular dependency between systeminfo.h and time.h --- include/coreinit/systeminfo.h | 3 +-- include/coreinit/thread.h | 1 - include/coreinit/time.h | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/coreinit/systeminfo.h b/include/coreinit/systeminfo.h index b5cac51..5d61774 100644 --- a/include/coreinit/systeminfo.h +++ b/include/coreinit/systeminfo.h @@ -1,6 +1,5 @@ #pragma once #include -#include "time.h" /** * \defgroup coreinit_systeminfo System Info @@ -18,7 +17,7 @@ struct OSSystemInfo { uint32_t busClockSpeed; uint32_t coreClockSpeed; - OSTime baseTime; + int64_t baseTime; UNKNOWN(0x10); }; CHECK_OFFSET(OSSystemInfo, 0x0, busClockSpeed); diff --git a/include/coreinit/thread.h b/include/coreinit/thread.h index 8f4852b..cccfcc6 100644 --- a/include/coreinit/thread.h +++ b/include/coreinit/thread.h @@ -1,6 +1,5 @@ #pragma once #include -#include "systeminfo.h" #include "context.h" #include "time.h" #include "threadqueue.h" diff --git a/include/coreinit/time.h b/include/coreinit/time.h index edf7935..2145575 100644 --- a/include/coreinit/time.h +++ b/include/coreinit/time.h @@ -1,5 +1,6 @@ #pragma once #include +#include "systeminfo.h" /** * \defgroup coreinit_time Time