From 2fcc6eb34da453a989a02202206c27b6643548fc Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 10 Sep 2023 22:19:14 -0700 Subject: [PATCH] another fix for size_t error --- include/JSystem/JKernel/JKRHeap.h | 2 +- src/JSystem/JFramework/JFWDisplay.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index 585d22a08..e3b4b802c 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -181,7 +181,7 @@ public: // override unless we give it that. I don't know of an easy way to convince // IntelliSense that we're in a 32-bit project, so just give it a different size. #if defined __INTELLISENSE__ -typedef unsigned long long NEW_SIZE; +typedef unsigned int NEW_SIZE; #else typedef u32 NEW_SIZE; #endif diff --git a/src/JSystem/JFramework/JFWDisplay.cpp b/src/JSystem/JFramework/JFWDisplay.cpp index c3e664c21..268ae0618 100644 --- a/src/JSystem/JFramework/JFWDisplay.cpp +++ b/src/JSystem/JFramework/JFWDisplay.cpp @@ -42,7 +42,7 @@ void JFWDisplay::ctor_subroutine(const _GXRenderModeObj* mode, bool enableAlpha) mZClear = 0xFFFFFF; - mpRenderMode = mode != 0 ? mode : JUTVideo::sManager->getRenderMode(); + mpRenderMode = mode != 0 ? mode : JUTVideo::getManager()->getRenderMode(); mGamma = 0; mpFader = 0; @@ -83,7 +83,7 @@ JFWDisplay* JFWDisplay::createManager(JKRHeap* p_heap, JUTXfb::EXfbNumber xfb_nu return sManager; } -static dummyFunc() { +static void dummyFunc() { OSReport("sManager"); OSReport("mTemporarySingle"); } @@ -544,6 +544,6 @@ void diagnoseGpHang() { } } -static dummyFunc2() { +static void dummyFunc2() { OSReport("\0\0\0\0\0\0"); }