diff options
Diffstat (limited to 'include/JSystem')
| -rw-r--r-- | include/JSystem/JGadget/linklist.h | 4 | ||||
| -rw-r--r-- | include/JSystem/JSystem.h | 2 | ||||
| -rw-r--r-- | include/JSystem/JUtility/JUTResFont.h | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/include/JSystem/JGadget/linklist.h b/include/JSystem/JGadget/linklist.h index 2fcb281f06..47a438ddb8 100644 --- a/include/JSystem/JGadget/linklist.h +++ b/include/JSystem/JGadget/linklist.h @@ -270,7 +270,11 @@ struct TLinkList_factory : public TLinkList<T, I> { template <typename T, int I> TLinkList_factory<T, I>::~TLinkList_factory() { +#ifdef __MWERKS__ JGADGET_ASSERTWARN(934, empty()); +#else + JGADGET_ASSERTWARN(934, this->empty()); +#endif } template <typename T> diff --git a/include/JSystem/JSystem.h b/include/JSystem/JSystem.h index 82231fe4d4..2b2f1143d0 100644 --- a/include/JSystem/JSystem.h +++ b/include/JSystem/JSystem.h @@ -1,7 +1,7 @@ #ifndef JSYSTEM_H #define JSYSTEM_H -#ifdef __MWERKS__ +#if __MWERKS__ && !defined(DECOMPCTX) #include "JSystem/JSystem.mch" // IWYU pragma: export #else #include "JSystem/JSystem.pch" // IWYU pragma: export diff --git a/include/JSystem/JUtility/JUTResFont.h b/include/JSystem/JUtility/JUTResFont.h index 819c77c05e..473a8e8f99 100644 --- a/include/JSystem/JUtility/JUTResFont.h +++ b/include/JSystem/JUtility/JUTResFont.h @@ -79,7 +79,7 @@ public: /* 0x6C */ const IsLeadByte_func* mIsLeadByte; }; -extern u8 const JUTResFONT_Ascfont_fix12[16736]; -extern u8 const JUTResFONT_Ascfont_fix16[16736]; +extern u8 const JUTResFONT_Ascfont_fix12[]; +extern u8 const JUTResFONT_Ascfont_fix16[]; #endif /* JUTRESFONT_H */ |