diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/include/JSystem/J2DGraph/J2DPrint.h index 234f1c0c29..be06e01c26 100644 --- a/include/JSystem/J2DGraph/J2DPrint.h +++ b/include/JSystem/J2DGraph/J2DPrint.h @@ -2,7 +2,7 @@ #define J2DPRINT_H #include "JSystem/J2DGraph/J2DTextBox.h" -#include +#include class JUTFont; class J2DPrint; diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h index dcb74c1f46..462849c843 100644 --- a/include/JSystem/J3DGraphBase/J3DMaterial.h +++ b/include/JSystem/J3DGraphBase/J3DMaterial.h @@ -4,7 +4,7 @@ #include "JSystem/J3DGraphBase/J3DMatBlock.h" #include "JSystem/J3DGraphBase/J3DPacket.h" #include "JSystem/J3DGraphBase/J3DShape.h" -#include +#include class J3DJoint; class J3DMaterialAnm; diff --git a/include/JSystem/J3DGraphBase/J3DPacket.h b/include/JSystem/J3DGraphBase/J3DPacket.h index 92b817ec23..c5ff05c350 100644 --- a/include/JSystem/J3DGraphBase/J3DPacket.h +++ b/include/JSystem/J3DGraphBase/J3DPacket.h @@ -3,7 +3,7 @@ #include "JSystem/J3DGraphBase/J3DSys.h" #include "dolphin/gd/GDBase.h" -#include +#include class J3DMatPacket; diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h index 72a165645b..f046a75262 100644 --- a/include/JSystem/J3DGraphBase/J3DTexture.h +++ b/include/JSystem/J3DGraphBase/J3DTexture.h @@ -5,7 +5,7 @@ #include "JSystem/J3DAssert.h" #include "JSystem/JUtility/JUTTexture.h" #include "global.h" -#include +#include /** * @ingroup jsystem-j3d diff --git a/include/JSystem/JAudio2/JAISeqDataMgr.h b/include/JSystem/JAudio2/JAISeqDataMgr.h index 510f1f4905..c207f0878c 100644 --- a/include/JSystem/JAudio2/JAISeqDataMgr.h +++ b/include/JSystem/JAudio2/JAISeqDataMgr.h @@ -2,7 +2,7 @@ #define JAISEQDATAMGR_H #include "JSystem/JAudio2/JAISound.h" -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASGadget.h b/include/JSystem/JAudio2/JASGadget.h index 5c3e9f5542..718ce02069 100644 --- a/include/JSystem/JAudio2/JASGadget.h +++ b/include/JSystem/JAudio2/JASGadget.h @@ -2,7 +2,7 @@ #define JASGADGET_H #include "JSystem/JUtility/JUTAssert.h" -#include "string.h" +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JAUSectionHeap.h b/include/JSystem/JAudio2/JAUSectionHeap.h index 25eee17d55..a7535500a4 100644 --- a/include/JSystem/JAudio2/JAUSectionHeap.h +++ b/include/JSystem/JAudio2/JAUSectionHeap.h @@ -4,7 +4,7 @@ #include "JSystem/JAudio2/JAUBankTable.h" #include "JSystem/JAudio2/JAUSeqDataBlockMgr.h" #include "JSystem/JKernel/JKRDisposer.h" -#include "bitset.h" +#include class JAISeqData; class JAISeqDataMgr; diff --git a/include/JSystem/JAudio2/JAUStreamAramMgr.h b/include/JSystem/JAudio2/JAUStreamAramMgr.h index da44e02e6f..d33306d323 100644 --- a/include/JSystem/JAudio2/JAUStreamAramMgr.h +++ b/include/JSystem/JAudio2/JAUStreamAramMgr.h @@ -5,8 +5,8 @@ #include "JSystem/JAudio2/JASAramStream.h" #include "JSystem/JAudio2/JASHeapCtrl.h" #include "JSystem/JUtility/JUTAssert.h" -#include "bitset.h" -#include +#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JGadget/linklist.h b/include/JSystem/JGadget/linklist.h index 47a438ddb8..8d0f7c43b1 100644 --- a/include/JSystem/JGadget/linklist.h +++ b/include/JSystem/JGadget/linklist.h @@ -4,7 +4,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JGadget/define.h" #include "JSystem/JGadget/search.h" -#include +#include namespace JGadget { diff --git a/include/JSystem/JGadget/search.h b/include/JSystem/JGadget/search.h index 555cf63cd7..bbc5c9ce6c 100644 --- a/include/JSystem/JGadget/search.h +++ b/include/JSystem/JGadget/search.h @@ -2,9 +2,9 @@ #define JGADGET_SEARCH_H #include -#include -#include -#include +#include +#include +#include namespace JGadget { namespace search { diff --git a/include/JSystem/JGadget/std-streambuf.h b/include/JSystem/JGadget/std-streambuf.h index 06ac0e36e7..d6bf291415 100644 --- a/include/JSystem/JGadget/std-streambuf.h +++ b/include/JSystem/JGadget/std-streambuf.h @@ -2,7 +2,7 @@ #define JGADGET_STD_STREAMBUF_H #include -#include +#include namespace JGadget { template diff --git a/include/JSystem/JGadget/std-vector.h b/include/JSystem/JGadget/std-vector.h index 652ea7c3a3..4e74855e55 100644 --- a/include/JSystem/JGadget/std-vector.h +++ b/include/JSystem/JGadget/std-vector.h @@ -2,9 +2,9 @@ #define STD_VECTOR_H #include "JSystem/JGadget/std-memory.h" -#include -#include -#include +#include +#include +#include namespace JGadget { namespace vector { diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index c90d3bdc81..c13d838082 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -2,9 +2,14 @@ #define JGEOMETRY_H #include "dolphin/mtx.h" -#include +#include #include "JSystem/JMath/JMath.h" +#ifndef __MWERKS__ +#include +#define FLT_EPSILON std::numeric_limits::epsilon() +#endif + namespace JGeometry { template diff --git a/include/JSystem/JHostIO/JORMContext.h b/include/JSystem/JHostIO/JORMContext.h index 0db8cf22a6..f16ffdd57d 100644 --- a/include/JSystem/JHostIO/JORMContext.h +++ b/include/JSystem/JHostIO/JORMContext.h @@ -2,7 +2,7 @@ #define JORMCONTEXT_H #include -#include +#include #include "JSystem/JHostIO/JORReflexible.h" #include "JSystem/JSupport/JSUMemoryStream.h" diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h index 1535ba757b..f7739ada1d 100644 --- a/include/JSystem/JKernel/JKRExpHeap.h +++ b/include/JSystem/JKernel/JKRExpHeap.h @@ -2,7 +2,7 @@ #define JKREXPHEAP_H #include "JSystem/JKernel/JKRHeap.h" -#include +#include /** * @ingroup jsystem-jkernel diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index ec9ca10497..e0162fc595 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -204,9 +204,11 @@ void* operator new[](size_t size, JKRHeap* heap, int alignment); void operator delete(void* ptr); void operator delete[](void* ptr); +#ifdef __MWERKS__ inline void* operator new(size_t size, void* ptr) { return ptr; } +#endif void JKRDefaultMemoryErrorRoutine(void* heap, u32 size, int alignment); diff --git a/include/JSystem/JMath/JMATrigonometric.h b/include/JSystem/JMath/JMATrigonometric.h index 276ea2399e..8b15f6624e 100644 --- a/include/JSystem/JMath/JMATrigonometric.h +++ b/include/JSystem/JMath/JMATrigonometric.h @@ -2,7 +2,7 @@ #define JMATRIGONOMETRIC_H #include "dolphin/types.h" -#include +#include namespace JMath { template diff --git a/include/JSystem/JMath/JMath.h b/include/JSystem/JMath/JMath.h index 35cde38bef..c6f26c771f 100644 --- a/include/JSystem/JMath/JMath.h +++ b/include/JSystem/JMath/JMath.h @@ -2,7 +2,7 @@ #define JMATH_H #include "dolphin/mtx.h" -#include +#include void JMAMTXApplyScale(const Mtx, Mtx, f32, f32, f32); void JMAEulerToQuat(s16 param_0, s16 param_1, s16 param_2, Quaternion* param_3); diff --git a/include/JSystem/JMessage/processor.h b/include/JSystem/JMessage/processor.h index feb5be25c4..cfb20c2c46 100644 --- a/include/JSystem/JMessage/processor.h +++ b/include/JSystem/JMessage/processor.h @@ -2,7 +2,7 @@ #define JMESSAGE_PROCESSOR_H #include "JSystem/JMessage/resource.h" -#include +#include #include "global.h" namespace JMessage { diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h index 9ce16e8f22..c47cd538d6 100644 --- a/include/JSystem/JParticle/JPAEmitter.h +++ b/include/JSystem/JParticle/JPAEmitter.h @@ -2,7 +2,7 @@ #define JPAEMITTER_H #include -#include +#include #include "JSystem/JParticle/JPAResource.h" #include "JSystem/JParticle/JPAList.h" #include "JSystem/JParticle/JPARandom.h" diff --git a/include/JSystem/JStudio/JStudio/functionvalue.h b/include/JSystem/JStudio/JStudio/functionvalue.h index 74f89eb2d7..f2f51ae923 100644 --- a/include/JSystem/JStudio/JStudio/functionvalue.h +++ b/include/JSystem/JStudio/JStudio/functionvalue.h @@ -1,7 +1,7 @@ #ifndef FUNCTIONVALUE_H #define FUNCTIONVALUE_H -#include +#include #include "JSystem/JGadget/std-vector.h" #include "JSystem/JGadget/define.h" #include "JSystem/JGadget/search.h" diff --git a/include/JSystem/JStudio/JStudio/jstudio-math.h b/include/JSystem/JStudio/JStudio/jstudio-math.h index 109d17230d..d902c218fa 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-math.h +++ b/include/JSystem/JStudio/JStudio/jstudio-math.h @@ -2,7 +2,7 @@ #define JSTUDIO_MATH_H #include "dolphin/mtx.h" -#include +#include namespace JStudio { namespace math { diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h index 6bca78c4c0..653ffc9474 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-object.h +++ b/include/JSystem/JStudio/JStudio/jstudio-object.h @@ -3,8 +3,8 @@ #include "JSystem/JStudio/JStudio/jstudio-control.h" #include "global.h" -#include -#include +#include +#include typedef struct _GXColor GXColor; diff --git a/include/JSystem/JSupport/JSupport.h b/include/JSystem/JSupport/JSupport.h index 717fd9b7b0..bdd2960543 100644 --- a/include/JSystem/JSupport/JSupport.h +++ b/include/JSystem/JSupport/JSupport.h @@ -2,7 +2,7 @@ #define JSUPPORT_H #include -#include +#include /** * @ingroup jsystem-jsupport diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h index 6f9194b837..7b852eb0a0 100644 --- a/include/JSystem/JUtility/JUTConsole.h +++ b/include/JSystem/JUtility/JUTConsole.h @@ -4,7 +4,7 @@ #include "JSystem/JGadget/linklist.h" #include "JSystem/JKernel/JKRDisposer.h" #include "JSystem/JUtility/JUTFont.h" -#include +#include /** * @ingroup jsystem-jutility diff --git a/include/JSystem/JUtility/JUTDirectPrint.h b/include/JSystem/JUtility/JUTDirectPrint.h index d856510ff3..aeff790f55 100644 --- a/include/JSystem/JUtility/JUTDirectPrint.h +++ b/include/JSystem/JUtility/JUTDirectPrint.h @@ -2,7 +2,7 @@ #define JUTDIRECTPRINT_H #include "JSystem/JUtility/TColor.h" -#include +#include /** * @ingroup jsystem-jutility diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h index 197936ed81..29849460e9 100644 --- a/include/JSystem/JUtility/JUTException.h +++ b/include/JSystem/JUtility/JUTException.h @@ -3,7 +3,7 @@ #include "JSystem/JKernel/JKRThread.h" #include "JSystem/JUtility/JUTGamePad.h" -#include +#include #include #include #include "global.h" diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h index 7b3639d6af..193a3ac3fd 100644 --- a/include/JSystem/JUtility/JUTFont.h +++ b/include/JSystem/JUtility/JUTFont.h @@ -2,7 +2,7 @@ #define JUTFONT_H #include "JSystem/JUtility/TColor.h" -#include "string.h" +#include /** * @ingroup jsystem-jutility diff --git a/include/JSystem/JUtility/JUTTexture.h b/include/JSystem/JUtility/JUTTexture.h index 2fc24af2c2..d83be32158 100644 --- a/include/JSystem/JUtility/JUTTexture.h +++ b/include/JSystem/JUtility/JUTTexture.h @@ -2,7 +2,7 @@ #define JUTTEXTURE_H #include -#include +#include class JUTPalette; diff --git a/include/SSystem/SComponent/c_m3d.h b/include/SSystem/SComponent/c_m3d.h index 6634100209..a8045c74a7 100644 --- a/include/SSystem/SComponent/c_m3d.h +++ b/include/SSystem/SComponent/c_m3d.h @@ -1,7 +1,7 @@ #ifndef C_M3D_H_ #define C_M3D_H_ -#include +#include #include "dolphin/mtx.h" class cM3dGAab; diff --git a/include/SSystem/SComponent/c_math.h b/include/SSystem/SComponent/c_math.h index c525dfa7e4..0203b4e2f1 100644 --- a/include/SSystem/SComponent/c_math.h +++ b/include/SSystem/SComponent/c_math.h @@ -3,6 +3,13 @@ #include "JSystem/JMath/JMATrigonometric.h" +#ifndef __MWERKS__ +#include +#ifndef FLT_MAX +#define FLT_MAX std::numeric_limits::max() +#endif +#endif + s16 cM_rad2s(float rad); u16 U_GetAtanTable(float, float); s16 cM_atan2s(float y, float x); diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index be2bf76935..838949cb13 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -2,7 +2,7 @@ #define C_XYZ_H #include "dolphin/mtx.h" -#include +#include struct cXyz : Vec { static const cXyz Zero; diff --git a/include/d/actor/d_a_obj_dust.h b/include/d/actor/d_a_obj_dust.h index 8adb5133b8..8f00781e8c 100644 --- a/include/d/actor/d_a_obj_dust.h +++ b/include/d/actor/d_a_obj_dust.h @@ -11,7 +11,7 @@ #include "d/d_resorce.h" #include "d/d_s_play.h" -#include +#include /** * @ingroup actors-objects diff --git a/include/d/d_menu_dmap_map.h b/include/d/d_menu_dmap_map.h index ca8b26f15e..311448c72b 100644 --- a/include/d/d_menu_dmap_map.h +++ b/include/d/d_menu_dmap_map.h @@ -2,7 +2,7 @@ #define D_MENU_D_MENU_DMAP_MAP_H #include "d/d_menu_dmap.h" -#include +#include class dMenu_DmapMap_c { public: diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h index db8efde952..86722f7bf9 100644 --- a/include/d/d_resorce.h +++ b/include/d/d_resorce.h @@ -42,7 +42,9 @@ public: return --mCount; } +#ifdef __MWERKS__ static const int NAME_MAX = 9; +#endif private: /* 0x00 */ char mArchiveName[11]; diff --git a/include/d/d_save.h b/include/d/d_save.h index fff3db0a7a..b99d904023 100644 --- a/include/d/d_save.h +++ b/include/d/d_save.h @@ -1,7 +1,7 @@ #ifndef D_SAVE_D_SAVE_H #define D_SAVE_D_SAVE_H -#include "string.h" +#include #include "SSystem/SComponent/c_xyz.h" #include #include "global.h" diff --git a/include/d/dolzel_base.pch b/include/d/dolzel_base.pch index ddbcc3da7d..c49cbbb2ba 100644 --- a/include/d/dolzel_base.pch +++ b/include/d/dolzel_base.pch @@ -5,13 +5,13 @@ #include "weak_bss_1109_to_1009.h" // IWYU pragma: export // Fixes weak .data -#include "cmath.h" // IWYU pragma: export +#include // IWYU pragma: export #include "JSystem/J3DGraphBase/J3DMatBlock.h" // IWYU pragma: export #include "Z2AudioLib/Z2Calc.h" // IWYU pragma: export // Fixes weak function ordering -#include "math.h" // IWYU pragma: export -#include "cstring.h" // IWYU pragma: export +#include // IWYU pragma: export +#include // IWYU pragma: export #include "JSystem/JKernel/JKRDisposer.h" // IWYU pragma: export #include "JSystem/J3DGraphBase/J3DPacket.h" // IWYU pragma: export #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" // IWYU pragma: export diff --git a/include/dolphin/os.h b/include/dolphin/os.h index 1abc59108f..f9bd33ab5b 100644 --- a/include/dolphin/os.h +++ b/include/dolphin/os.h @@ -1,7 +1,7 @@ #ifndef _DOLPHIN_OS_H_ #define _DOLPHIN_OS_H_ -#include +#include #ifdef __REVOLUTION_SDK__ #include diff --git a/include/dolphin/types.h b/include/dolphin/types.h index 53ba266cbe..8411e10999 100644 --- a/include/dolphin/types.h +++ b/include/dolphin/types.h @@ -82,7 +82,7 @@ typedef unsigned int uint; #define __REGISTER #endif -#include +#include #endif #endif diff --git a/include/f_ap/f_ap_game.h b/include/f_ap/f_ap_game.h index 836554ba50..360b4c5a07 100644 --- a/include/f_ap/f_ap_game.h +++ b/include/f_ap/f_ap_game.h @@ -6,7 +6,7 @@ #include "JSystem/JFramework/JFWDisplay.h" #include "JSystem/JUtility/JUTAssert.h" #include "CaptureScreen.h" -#include +#include void fapGm_After(); void fapGm_Create(); diff --git a/include/global.h b/include/global.h index ab207f43d3..cf8e285c23 100644 --- a/include/global.h +++ b/include/global.h @@ -50,9 +50,11 @@ // Necessary for debug matches. #define UNUSED(x) ((void)(x)) +#ifdef __MWERKS__ #ifndef decltype #define decltype __decltype__ #endif +#endif #define _SDA_BASE_(dummy) 0 #define _SDA2_BASE_(dummy) 0 diff --git a/include/m_Do/m_Do_hostIO.h b/include/m_Do/m_Do_hostIO.h index 643143cd45..4542ff4ab9 100644 --- a/include/m_Do/m_Do_hostIO.h +++ b/include/m_Do/m_Do_hostIO.h @@ -2,7 +2,7 @@ #define M_DO_M_DO_HOSTIO_H #include "JSystem/JHostIO/JORReflexible.h" -#include +#include class mDoHIO_child_c { public: diff --git a/include/revolution/os.h b/include/revolution/os.h index 351615ee52..703891f29b 100644 --- a/include/revolution/os.h +++ b/include/revolution/os.h @@ -1,7 +1,7 @@ #ifndef _REVOLUTION_OS_H_ #define _REVOLUTION_OS_H_ -#include +#include #include #include diff --git a/include/revolution/types.h b/include/revolution/types.h index 65fbba9203..2434b54085 100644 --- a/include/revolution/types.h +++ b/include/revolution/types.h @@ -79,6 +79,6 @@ typedef unsigned int uint; #define __REGISTER #endif -#include +#include #endif diff --git a/include/revolution/wpad/bte.h b/include/revolution/wpad/bte.h index 1751d8998b..c816fa8baf 100644 --- a/include/revolution/wpad/bte.h +++ b/include/revolution/wpad/bte.h @@ -1,7 +1,7 @@ #ifndef CONTEXT_BTE_H #define CONTEXT_BTE_H -#include +#include // taken from https://github.com/doldecomp/sdk_2009-12-11/blob/main/include/context_bte.h diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp index 9a70147dc0..eb0b559221 100644 --- a/src/DynamicLink.cpp +++ b/src/DynamicLink.cpp @@ -8,7 +8,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRFileCache.h" #include "JSystem/JUtility/JUTConsole.h" -#include +#include #include "m_Do/m_Do_dvd_thread.h" #include "m_Do/m_Do_ext.h" diff --git a/src/JSystem/J2DGraph/J2DManage.cpp b/src/JSystem/J2DGraph/J2DManage.cpp index 0af6517313..10758a8268 100644 --- a/src/JSystem/J2DGraph/J2DManage.cpp +++ b/src/JSystem/J2DGraph/J2DManage.cpp @@ -2,7 +2,7 @@ #include "JSystem/J2DGraph/J2DManage.h" #include "JSystem/JSupport/JSUInputStream.h" -#include "string.h" +#include void* J2DDataManage::get(char const* name) { for (J2DataManageLink* link = mList; link != NULL; link = link->mNext) { diff --git a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp index a0229abb69..a4ef4b6672 100644 --- a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp +++ b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp @@ -5,7 +5,7 @@ #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/JSupport/JSupport.h" #include "JSystem/JUtility/JUTResource.h" -#include "string.h" +#include #include "dolphin/types.h" J2DMaterialFactory::J2DMaterialFactory(J2DMaterialBlock const& param_0) { diff --git a/src/JSystem/J2DGraph/J2DPrint.cpp b/src/JSystem/J2DGraph/J2DPrint.cpp index 9dfb3954d2..a155a2e62f 100644 --- a/src/JSystem/J2DGraph/J2DPrint.cpp +++ b/src/JSystem/J2DGraph/J2DPrint.cpp @@ -3,8 +3,8 @@ #include "JSystem/J2DGraph/J2DPrint.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTFont.h" -#include -#include +#include +#include char* J2DPrint::mStrBuff; diff --git a/src/JSystem/J2DGraph/J2DTevs.cpp b/src/JSystem/J2DGraph/J2DTevs.cpp index cfd68821e5..3f6010e4df 100644 --- a/src/JSystem/J2DGraph/J2DTevs.cpp +++ b/src/JSystem/J2DGraph/J2DTevs.cpp @@ -6,7 +6,7 @@ #include "JSystem/J2DGraph/J2DTevs.h" #include "JSystem/J2DGraph/J2DMatBlock.h" -#include +#include #include "dolphin/gx.h" void J2DTexMtx::load(u32 mtxIdx) { diff --git a/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp b/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp index d8ddfdea22..d2501ea709 100644 --- a/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp @@ -3,7 +3,7 @@ #include "JSystem/J3DGraphAnimator/J3DSkinDeform.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "JSystem/JKernel/JKRHeap.h" -#include +#include J3DSkinNList::J3DSkinNList() { field_0x0 = NULL; diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp index 6256c376af..21a8bf5789 100644 --- a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp +++ b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp @@ -5,7 +5,7 @@ #include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/J3DGraphBase/J3DTransform.h" #include "global.h" -#include +#include inline void loadMatColors(const J3DGXColor* color) { J3DGDWriteXFCmdHdr(0x100C, 2); diff --git a/src/JSystem/J3DGraphBase/J3DPacket.cpp b/src/JSystem/J3DGraphBase/J3DPacket.cpp index b99c5a8f1d..173061882c 100644 --- a/src/JSystem/J3DGraphBase/J3DPacket.cpp +++ b/src/JSystem/J3DGraphBase/J3DPacket.cpp @@ -7,7 +7,7 @@ #include "JSystem/J3DGraphBase/J3DShapeMtx.h" #include "JSystem/JKernel/JKRHeap.h" #include -#include "string.h" +#include #include "global.h" J3DError J3DDisplayListObj::newDisplayList(u32 maxSize) { diff --git a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp index dc00a46f9a..50bd2ac793 100644 --- a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp +++ b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp @@ -2,8 +2,8 @@ #include "JSystem/J3DGraphBase/J3DShapeDraw.h" #include "JSystem/JKernel/JKRHeap.h" -#include -#include +#include +#include #include u32 J3DShapeDraw::countVertex(u32 stride) { diff --git a/src/JSystem/J3DGraphBase/J3DVertex.cpp b/src/JSystem/J3DGraphBase/J3DVertex.cpp index 29a826b74f..3724aa6b94 100644 --- a/src/JSystem/J3DGraphBase/J3DVertex.cpp +++ b/src/JSystem/J3DGraphBase/J3DVertex.cpp @@ -4,7 +4,7 @@ #include "JSystem/J3DGraphAnimator/J3DJointTree.h" #include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/JKernel/JKRHeap.h" -#include +#include J3DVertexData::J3DVertexData() { mVtxNum = 0; diff --git a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp index 895652ef40..b6afb156b9 100644 --- a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp +++ b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp @@ -9,7 +9,7 @@ #include "JSystem/JSupport/JSupport.h" #include "JSystem/JKernel/JKRHeap.h" #include "dolphin/os.h" -#include "string.h" +#include void* J3DClusterLoaderDataBase::load(const void* i_data) { const JUTDataFileHeader* fileHeader = (JUTDataFileHeader*)i_data; diff --git a/src/JSystem/J3DU/J3DUClipper.cpp b/src/JSystem/J3DU/J3DUClipper.cpp index 04edda6427..59367bee3a 100644 --- a/src/JSystem/J3DU/J3DUClipper.cpp +++ b/src/JSystem/J3DU/J3DUClipper.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/J3DU/J3DUClipper.h" -#include +#include void J3DUClipper::init() { mNear = 1.0f; diff --git a/src/JSystem/JAHostIO/JAHioUtil.cpp b/src/JSystem/JAHostIO/JAHioUtil.cpp index 6c938ec2b7..8bc18b763d 100644 --- a/src/JSystem/JAHostIO/JAHioUtil.cpp +++ b/src/JSystem/JAHostIO/JAHioUtil.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JAHostIO/JAHioUtil.h" -#include "stdio.h" +#include char JAHioUtil::mStringBuffer[256]; diff --git a/src/JSystem/JAWExtSystem/JAWExtSystem.cpp b/src/JSystem/JAWExtSystem/JAWExtSystem.cpp index 4e63330b3d..9495148ece 100644 --- a/src/JSystem/JAWExtSystem/JAWExtSystem.cpp +++ b/src/JSystem/JAWExtSystem/JAWExtSystem.cpp @@ -5,7 +5,7 @@ #include "JSystem/JAWExtSystem/JAWGraphContext.h" #include "JSystem/JAWExtSystem/JAWWindow.h" #include "JSystem/JUtility/JUTGamePad.h" -#include "algorithm.h" +#include JGadget::TList JAWExtSystem::sPage[128]; JAWExtSystem::TSystemInterface JAWExtSystem::sInterface; diff --git a/src/JSystem/JAudio2/JASAiCtrl.cpp b/src/JSystem/JAudio2/JASAiCtrl.cpp index 662e5e6df4..9beb08f0bd 100644 --- a/src/JSystem/JAudio2/JASAiCtrl.cpp +++ b/src/JSystem/JAudio2/JASAiCtrl.cpp @@ -16,7 +16,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "dolphin/ai.h" #include -#include +#include s16* JASDriver::sDmaDacBuffer[3]; diff --git a/src/JSystem/JAudio2/JASAudioThread.cpp b/src/JSystem/JAudio2/JASAudioThread.cpp index e1f6f83f08..e74ba52e9a 100644 --- a/src/JSystem/JAudio2/JASAudioThread.cpp +++ b/src/JSystem/JAudio2/JASAudioThread.cpp @@ -10,7 +10,7 @@ #include "JSystem/JAudio2/JASReport.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "dolphin/dsp.h" -#include "stdint.h" +#include JASAudioThread::JASAudioThread(int stackSize, int msgCount, u32 threadPriority) : diff --git a/src/JSystem/JAudio2/JASBasicWaveBank.cpp b/src/JSystem/JAudio2/JASBasicWaveBank.cpp index f7417e174d..ad11ba25d2 100644 --- a/src/JSystem/JAudio2/JASBasicWaveBank.cpp +++ b/src/JSystem/JAudio2/JASBasicWaveBank.cpp @@ -4,7 +4,7 @@ #include "JSystem/JAudio2/JASMutex.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" -#include "stdint.h" +#include JASBasicWaveBank::JASBasicWaveBank() { mWaveTable = NULL; diff --git a/src/JSystem/JAudio2/JASCalc.cpp b/src/JSystem/JAudio2/JASCalc.cpp index 99695d6498..b4ef0d66be 100644 --- a/src/JSystem/JAudio2/JASCalc.cpp +++ b/src/JSystem/JAudio2/JASCalc.cpp @@ -1,8 +1,8 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JAudio2/JASCalc.h" -#include -#include +#include +#include void JASCalc::imixcopy(const s16* s1, const s16* s2, s16* dst, u32 n) { for (n; n != 0; n--) { diff --git a/src/JSystem/JAudio2/JASReport.cpp b/src/JSystem/JAudio2/JASReport.cpp index 744bc69eaf..941338ba3a 100644 --- a/src/JSystem/JAudio2/JASReport.cpp +++ b/src/JSystem/JAudio2/JASReport.cpp @@ -8,7 +8,7 @@ #include "JSystem/JAudio2/JASCalc.h" #include "JSystem/JAudio2/JASMutex.h" #include "JSystem/JKernel/JKRHeap.h" -#include +#include static OSMutex sMutex; diff --git a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp index 5598ab2277..a105fe7c37 100644 --- a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp +++ b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JAudio2/JASSimpleWaveBank.h" -#include "stdint.h" +#include JASSimpleWaveBank::JASSimpleWaveBank() { mWaveTable = NULL; diff --git a/src/JSystem/JAudio2/JASWaveArcLoader.cpp b/src/JSystem/JAudio2/JASWaveArcLoader.cpp index ee91eb3e8a..9672a087ae 100644 --- a/src/JSystem/JAudio2/JASWaveArcLoader.cpp +++ b/src/JSystem/JAudio2/JASWaveArcLoader.cpp @@ -5,9 +5,9 @@ #include "JSystem/JAudio2/JASTaskThread.h" #include "JSystem/JAudio2/JASMutex.h" #include "JSystem/JKernel/JKRDvdAramRipper.h" -#include "string.h" +#include #include "dolphin/os.h" -#include +#include JASHeap* JASWaveArcLoader::sAramHeap; diff --git a/src/JSystem/JFramework/JFWDisplay.cpp b/src/JSystem/JFramework/JFWDisplay.cpp index 7f775989b8..86b633f6fc 100644 --- a/src/JSystem/JFramework/JFWDisplay.cpp +++ b/src/JSystem/JFramework/JFWDisplay.cpp @@ -9,7 +9,7 @@ #include "dolphin/gx.h" #include #include "global.h" -#include "stdint.h" +#include void JFWDisplay::ctor_subroutine(bool enableAlpha) { mEnableAlpha = enableAlpha; diff --git a/src/JSystem/JGadget/binary.cpp b/src/JSystem/JGadget/binary.cpp index cde00093f2..af49191265 100644 --- a/src/JSystem/JGadget/binary.cpp +++ b/src/JSystem/JGadget/binary.cpp @@ -2,7 +2,7 @@ #include "JSystem/JGadget/binary.h" #include "JSystem/JGadget/define.h" -#include +#include #if DEBUG static void dummyString() { diff --git a/src/JSystem/JGadget/define.cpp b/src/JSystem/JGadget/define.cpp index f7496480ac..84b1914f17 100644 --- a/src/JSystem/JGadget/define.cpp +++ b/src/JSystem/JGadget/define.cpp @@ -3,7 +3,7 @@ #include "JSystem/JGadget/define.h" #define MSL_USE_INLINES 1 -#include +#include JGadget_outMessage::JGadget_outMessage(MessageFunc fn, const char* file, int line) { mMsgFunc = fn; diff --git a/src/JSystem/JGadget/std-stream.cpp b/src/JSystem/JGadget/std-stream.cpp index 418e8096a3..3ce2def24d 100644 --- a/src/JSystem/JGadget/std-stream.cpp +++ b/src/JSystem/JGadget/std-stream.cpp @@ -2,7 +2,7 @@ #include "JSystem/JGadget/std-stream.h" #include "JSystem/JGadget/define.h" -#include +#include #include namespace JGadget { diff --git a/src/JSystem/JGadget/std-streambuf.cpp b/src/JSystem/JGadget/std-streambuf.cpp index b9cc93de22..8a538021d9 100644 --- a/src/JSystem/JGadget/std-streambuf.cpp +++ b/src/JSystem/JGadget/std-streambuf.cpp @@ -2,7 +2,7 @@ #include "JSystem/JGadget/std-streambuf.h" #include "JSystem/JUtility/JUTAssert.h" -#include +#include namespace JGadget { TStreamBuffer::~TStreamBuffer() {} diff --git a/src/JSystem/JGadget/std-string.cpp b/src/JSystem/JGadget/std-string.cpp index 04b416b0d1..9b7206b3ae 100644 --- a/src/JSystem/JGadget/std-string.cpp +++ b/src/JSystem/JGadget/std-string.cpp @@ -1,6 +1,6 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep -#include +#include static void dummy() { u32 a = 0; diff --git a/src/JSystem/JHostIO/JHIMccBuf.cpp b/src/JSystem/JHostIO/JHIMccBuf.cpp index 0e2e8a2f4c..f71f9fc0fa 100644 --- a/src/JSystem/JHostIO/JHIMccBuf.cpp +++ b/src/JSystem/JHostIO/JHIMccBuf.cpp @@ -4,7 +4,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JHostIO/JHIRMcc.h" #include -#include +#include void JHIReport(const char* fmt, ...) {} diff --git a/src/JSystem/JHostIO/JORServer.cpp b/src/JSystem/JHostIO/JORServer.cpp index c724ba72e0..5a55a342c9 100644 --- a/src/JSystem/JHostIO/JORServer.cpp +++ b/src/JSystem/JHostIO/JORServer.cpp @@ -5,7 +5,7 @@ #include "JSystem/JHostIO/JORFile.h" #include "JSystem/JHostIO/JORHostInfo.h" #include "JSystem/JSupport/JSUMemoryStream.h" -#include +#include void JOREventCallbackListNode::JORAppend() { JORServer* pServer = JORServer::getInstance(); diff --git a/src/JSystem/JKernel/JKRAram.cpp b/src/JSystem/JKernel/JKRAram.cpp index e067e18c06..7d1c573f11 100644 --- a/src/JSystem/JKernel/JKRAram.cpp +++ b/src/JSystem/JKernel/JKRAram.cpp @@ -8,7 +8,7 @@ #include "JSystem/JUtility/JUTException.h" #include "dolphin/ar.h" #include -#include "string.h" +#include #if PLATFORM_GCN const u32 stack_size = 0xc00; diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/src/JSystem/JKernel/JKRAramArchive.cpp index 600d332fcb..35817fe158 100644 --- a/src/JSystem/JKernel/JKRAramArchive.cpp +++ b/src/JSystem/JKernel/JKRAramArchive.cpp @@ -7,8 +7,8 @@ #include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include -#include "string.h" +#include +#include JKRAramArchive::JKRAramArchive() {} diff --git a/src/JSystem/JKernel/JKRAramHeap.cpp b/src/JSystem/JKernel/JKRAramHeap.cpp index 345532a1a0..a1ea01f816 100644 --- a/src/JSystem/JKernel/JKRAramHeap.cpp +++ b/src/JSystem/JKernel/JKRAramHeap.cpp @@ -3,7 +3,7 @@ #include "JSystem/JKernel/JKRAramHeap.h" #include "JSystem/JKernel/JKRHeap.h" #include "global.h" -#include +#include JSUList JKRAramHeap::sAramList; diff --git a/src/JSystem/JKernel/JKRAramStream.cpp b/src/JSystem/JKernel/JKRAramStream.cpp index 94b9ca91fc..d126b08b5d 100644 --- a/src/JSystem/JKernel/JKRAramStream.cpp +++ b/src/JSystem/JKernel/JKRAramStream.cpp @@ -4,7 +4,7 @@ #include "JSystem/JKernel/JKRAramPiece.h" #include "JSystem/JSupport/JSUFileStream.h" #include "JSystem/JUtility/JUTException.h" -#include +#include #if PLATFORM_GCN const u32 stack_size = 0xc00; diff --git a/src/JSystem/JKernel/JKRArchivePri.cpp b/src/JSystem/JKernel/JKRArchivePri.cpp index c39d1bc70a..5dff53f00b 100644 --- a/src/JSystem/JKernel/JKRArchivePri.cpp +++ b/src/JSystem/JKernel/JKRArchivePri.cpp @@ -2,8 +2,8 @@ #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JKernel/JKRHeap.h" -#include "ctype.h" -#include "string.h" +#include +#include u32 JKRArchive::sCurrentDirID; diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/src/JSystem/JKernel/JKRCompArchive.cpp index 5e64c3b2e2..5e9eb638e6 100644 --- a/src/JSystem/JKernel/JKRCompArchive.cpp +++ b/src/JSystem/JKernel/JKRCompArchive.cpp @@ -10,9 +10,9 @@ #include "JSystem/JKernel/JKRMemArchive.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include -#include "string.h" -#include +#include +#include +#include JKRCompArchive::JKRCompArchive(s32 entryNum, JKRArchive::EMountDirection eMountDirection) : JKRArchive(entryNum, MOUNT_COMP) { diff --git a/src/JSystem/JKernel/JKRDvdAramRipper.cpp b/src/JSystem/JKernel/JKRDvdAramRipper.cpp index 764a12cc78..8d44cc29d8 100644 --- a/src/JSystem/JKernel/JKRDvdAramRipper.cpp +++ b/src/JSystem/JKernel/JKRDvdAramRipper.cpp @@ -11,7 +11,7 @@ #include #include "dolphin/vi.h" #include "global.h" -#include "string.h" +#include static int JKRDecompressFromDVDToAram(JKRDvdFile*, u32, u32, u32, u32, u32, u32*); static int decompSZS_subroutine(u8*, u32); diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp index 74e182a374..0a74ca8c01 100644 --- a/src/JSystem/JKernel/JKRDvdArchive.cpp +++ b/src/JSystem/JKernel/JKRDvdArchive.cpp @@ -6,10 +6,10 @@ #include "JSystem/JKernel/JKRDvdRipper.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include -#include "string.h" +#include +#include #include "global.h" -#include +#include JKRDvdArchive::JKRDvdArchive(s32 entryNum, JKRArchive::EMountDirection mountDirection) : JKRArchive(entryNum, MOUNT_DVD) { diff --git a/src/JSystem/JKernel/JKRDvdFile.cpp b/src/JSystem/JKernel/JKRDvdFile.cpp index 20132c3a22..172827e520 100644 --- a/src/JSystem/JKernel/JKRDvdFile.cpp +++ b/src/JSystem/JKernel/JKRDvdFile.cpp @@ -3,7 +3,7 @@ #include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include "stdint.h" +#include JSUList JKRDvdFile::sDvdList; diff --git a/src/JSystem/JKernel/JKRDvdRipper.cpp b/src/JSystem/JKernel/JKRDvdRipper.cpp index 3f565bc67a..877d10d740 100644 --- a/src/JSystem/JKernel/JKRDvdRipper.cpp +++ b/src/JSystem/JKernel/JKRDvdRipper.cpp @@ -8,10 +8,10 @@ #include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JKernel/JKRDecomp.h" #include "JSystem/JUtility/JUTException.h" -#include "string.h" +#include #include #include "dolphin/vi.h" -#include +#include static int JKRDecompressFromDVD(JKRDvdFile*, void*, u32, u32, u32, u32, u32*); static int decompSZS_subroutine(u8*, u8*); diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/src/JSystem/JKernel/JKRExpHeap.cpp index a455bd07fb..9f1109d12a 100644 --- a/src/JSystem/JKernel/JKRExpHeap.cpp +++ b/src/JSystem/JKernel/JKRExpHeap.cpp @@ -9,7 +9,7 @@ #include "JSystem/JSupport/JSupport.h" #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTException.h" -#include +#include JKRExpHeap* JKRExpHeap::createRoot(int maxHeaps, bool errorFlag) { JKRExpHeap* heap = NULL; diff --git a/src/JSystem/JKernel/JKRFileCache.cpp b/src/JSystem/JKernel/JKRFileCache.cpp index b6ed72c1c3..2c764a7024 100644 --- a/src/JSystem/JKernel/JKRFileCache.cpp +++ b/src/JSystem/JKernel/JKRFileCache.cpp @@ -6,8 +6,8 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" -#include "ctype.h" -#include "string.h" +#include +#include #include "global.h" JKRFileCache* JKRFileCache::mount(const char* path, JKRHeap* heap, const char* param_3) { diff --git a/src/JSystem/JKernel/JKRFileLoader.cpp b/src/JSystem/JKernel/JKRFileLoader.cpp index 825fa20e8e..cf756ee279 100644 --- a/src/JSystem/JKernel/JKRFileLoader.cpp +++ b/src/JSystem/JKernel/JKRFileLoader.cpp @@ -4,8 +4,8 @@ #define MSL_USE_INLINES 1 // needed to inline tolower call. not inlined elsewhere in the repo -#include "string.h" -#include "ctype.h" +#include +#include #include "global.h" JKRFileLoader* JKRFileLoader::sCurrentVolume; diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/JSystem/JKernel/JKRHeap.cpp index dee3b904a3..b805901b78 100644 --- a/src/JSystem/JKernel/JKRHeap.cpp +++ b/src/JSystem/JKernel/JKRHeap.cpp @@ -8,8 +8,8 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include -#include +#include +#include #if DEBUG u8 JKRValue_DEBUGFILL_NOTUSE = 0xFD; diff --git a/src/JSystem/JKernel/JKRMemArchive.cpp b/src/JSystem/JKernel/JKRMemArchive.cpp index 7f2f587774..505329847c 100644 --- a/src/JSystem/JKernel/JKRMemArchive.cpp +++ b/src/JSystem/JKernel/JKRMemArchive.cpp @@ -5,9 +5,9 @@ #include "JSystem/JKernel/JKRDvdRipper.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include "string.h" +#include #include "global.h" -#include +#include JKRMemArchive::JKRMemArchive(s32 entryNum, JKRArchive::EMountDirection mountDirection) : JKRArchive(entryNum, MOUNT_MEM) { diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/src/JSystem/JKernel/JKRSolidHeap.cpp index 4f072cb714..593f4b78ac 100644 --- a/src/JSystem/JKernel/JKRSolidHeap.cpp +++ b/src/JSystem/JKernel/JKRSolidHeap.cpp @@ -5,8 +5,8 @@ #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTConsole.h" #include "global.h" -#include -#include +#include +#include JKRSolidHeap* JKRSolidHeap::create(u32 size, JKRHeap* heap, bool useErrorHandler) { if (!heap) { diff --git a/src/JSystem/JKernel/JKRThread.cpp b/src/JSystem/JKernel/JKRThread.cpp index c17a2dce21..0392beef0f 100644 --- a/src/JSystem/JKernel/JKRThread.cpp +++ b/src/JSystem/JKernel/JKRThread.cpp @@ -3,9 +3,9 @@ #include "JSystem/JKernel/JKRThread.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTConsole.h" -#include +#include #include "global.h" -#include +#include JSUList JKRThread::sThreadList(0); diff --git a/src/JSystem/JMath/JMATrigonometric.cpp b/src/JSystem/JMath/JMATrigonometric.cpp index 605353736d..89e36a413e 100644 --- a/src/JSystem/JMath/JMATrigonometric.cpp +++ b/src/JSystem/JMath/JMATrigonometric.cpp @@ -2,7 +2,7 @@ // don't include header until this "zero" mess is figured out // #include "JSystem/JMath/JMATrigonometric.h" -#include +#include #include "global.h" static f32 dummy() { diff --git a/src/JSystem/JMessage/processor.cpp b/src/JSystem/JMessage/processor.cpp index 58400bc70d..eef50e7516 100644 --- a/src/JSystem/JMessage/processor.cpp +++ b/src/JSystem/JMessage/processor.cpp @@ -3,7 +3,7 @@ #include "JSystem/JMessage/processor.h" #include "JSystem/JMessage/control.h" #include "JSystem/JUtility/JUTAssert.h" -#include +#include JMessage::TReference::~TReference() {} diff --git a/src/JSystem/JMessage/resource.cpp b/src/JSystem/JMessage/resource.cpp index 0007e370af..04387050c2 100644 --- a/src/JSystem/JMessage/resource.cpp +++ b/src/JSystem/JMessage/resource.cpp @@ -3,8 +3,8 @@ #include "JSystem/JMessage/resource.h" #include "JSystem/JGadget/search.h" #include "JSystem/JGadget/define.h" -#include -#include +#include +#include u16 JMessage::TResource::toMessageIndex_messageID(u32 uMsgID, u32 upperHalf, bool* pbValid) const { if (!oParse_TBlock_messageID_.getRaw()) { diff --git a/src/JSystem/JParticle/JPAResourceManager.cpp b/src/JSystem/JParticle/JPAResourceManager.cpp index 7b0de811bc..fba6d81ab7 100644 --- a/src/JSystem/JParticle/JPAResourceManager.cpp +++ b/src/JSystem/JParticle/JPAResourceManager.cpp @@ -3,7 +3,7 @@ #include "JSystem/JParticle/JPAResourceManager.h" #include "JSystem/JParticle/JPADynamicsBlock.h" #include "JSystem/JParticle/JPAResource.h" -#include "string.h" +#include struct JPAResourceLoader { JPAResourceLoader(u8 const*, JPAResourceManager*); diff --git a/src/JSystem/JStage/JSGCamera.cpp b/src/JSystem/JStage/JSGCamera.cpp index 19a16cf5b5..cd35cfed17 100644 --- a/src/JSystem/JStage/JSGCamera.cpp +++ b/src/JSystem/JStage/JSGCamera.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JStage/JSGCamera.h" -#include +#include JStage::TCamera::~TCamera() {} diff --git a/src/JSystem/JStage/JSGFog.cpp b/src/JSystem/JStage/JSGFog.cpp index 0f63fedd7e..cf1a8eb2c8 100644 --- a/src/JSystem/JStage/JSGFog.cpp +++ b/src/JSystem/JStage/JSGFog.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JStage/JSGFog.h" -#include +#include JStage::TFog::~TFog() {} diff --git a/src/JSystem/JStudio/JStudio/ctb.cpp b/src/JSystem/JStudio/JStudio/ctb.cpp index db86c69e77..a28752af7a 100644 --- a/src/JSystem/JStudio/JStudio/ctb.cpp +++ b/src/JSystem/JStudio/JStudio/ctb.cpp @@ -1,9 +1,9 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JStudio/JStudio/ctb.h" -#include "iterator.h" -#include "string.h" -#include +#include +#include +#include JStudio::ctb::TObject::~TObject() {} diff --git a/src/JSystem/JStudio/JStudio/functionvalue.cpp b/src/JSystem/JStudio/JStudio/functionvalue.cpp index 3a929bb433..7d891a47d6 100644 --- a/src/JSystem/JStudio/JStudio/functionvalue.cpp +++ b/src/JSystem/JStudio/JStudio/functionvalue.cpp @@ -5,9 +5,9 @@ #include "JSystem/JUtility/JUTException.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JGadget/linklist.h" -#include -#include -#include +#include +#include +#include namespace JStudio { diff --git a/src/JSystem/JStudio/JStudio/fvb.cpp b/src/JSystem/JStudio/JStudio/fvb.cpp index d10cd0c78a..94721909c4 100644 --- a/src/JSystem/JStudio/JStudio/fvb.cpp +++ b/src/JSystem/JStudio/JStudio/fvb.cpp @@ -2,7 +2,7 @@ #include "JSystem/JStudio/JStudio/fvb.h" #include "JSystem/JUtility/JUTException.h" -#include +#include namespace JStudio { namespace fvb { diff --git a/src/JSystem/JStudio/JStudio/jstudio-control.cpp b/src/JSystem/JStudio/JStudio/jstudio-control.cpp index 649501b4c9..38fe394ea0 100644 --- a/src/JSystem/JStudio/JStudio/jstudio-control.cpp +++ b/src/JSystem/JStudio/JStudio/jstudio-control.cpp @@ -7,7 +7,7 @@ #include "JSystem/JStudio/JStudio/jstudio-control.h" #include "JSystem/JStudio/JStudio/jstudio-math.h" #include "JSystem/JStudio/JStudio/jstudio-data.h" -#include "string.h" +#include JStudio::TControl::TControl() { mTransformOnSet = false; diff --git a/src/JSystem/JStudio/JStudio/jstudio-math.cpp b/src/JSystem/JStudio/JStudio/jstudio-math.cpp index e6c5403b64..0203a9e894 100644 --- a/src/JSystem/JStudio/JStudio/jstudio-math.cpp +++ b/src/JSystem/JStudio/JStudio/jstudio-math.cpp @@ -3,7 +3,7 @@ #include "JSystem/JStudio/JStudio/jstudio-math.h" #include "JSystem/JGeometry.h" #include "JSystem/TPosition3.h" -#include +#include void JStudio::math::getRotation_xyz(MtxP param_1, f32 x, f32 y, f32 z) { f32 cosx = cosf(DEG_TO_RAD(x)); diff --git a/src/JSystem/JStudio/JStudio/stb-data-parse.cpp b/src/JSystem/JStudio/JStudio/stb-data-parse.cpp index 3a0f7f54b9..a5d0136d2b 100644 --- a/src/JSystem/JStudio/JStudio/stb-data-parse.cpp +++ b/src/JSystem/JStudio/JStudio/stb-data-parse.cpp @@ -3,7 +3,7 @@ #include "JSystem/JStudio/JStudio/stb-data-parse.h" #include "JSystem/JUtility/JUTAssert.h" #include "dolphin/os.h" -#include "stdint.h" +#include namespace JStudio { namespace stb { diff --git a/src/JSystem/JStudio/JStudio/stb.cpp b/src/JSystem/JStudio/JStudio/stb.cpp index a84ad897ed..b2dbddbd6d 100644 --- a/src/JSystem/JStudio/JStudio/stb.cpp +++ b/src/JSystem/JStudio/JStudio/stb.cpp @@ -3,8 +3,8 @@ #include "JSystem/JStudio/JStudio/stb.h" #include "JSystem/JStudio/JStudio/jstudio-object.h" #include "JSystem/JUtility/JUTException.h" -#include -#include +#include +#include namespace JStudio { namespace stb { diff --git a/src/JSystem/JSupport/JSUMemoryStream.cpp b/src/JSystem/JSupport/JSUMemoryStream.cpp index 02913807d5..9364bc7d0d 100644 --- a/src/JSystem/JSupport/JSUMemoryStream.cpp +++ b/src/JSystem/JSupport/JSUMemoryStream.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JSupport/JSUMemoryStream.h" -#include "string.h" +#include void JSUMemoryInputStream::setBuffer(void const* pBuffer, s32 length) { mBuffer = pBuffer; diff --git a/src/JSystem/JSupport/JSUOutputStream.cpp b/src/JSystem/JSupport/JSUOutputStream.cpp index 3732397523..132b143c5d 100644 --- a/src/JSystem/JSupport/JSUOutputStream.cpp +++ b/src/JSystem/JSupport/JSUOutputStream.cpp @@ -3,7 +3,7 @@ #include "JSystem/JSupport/JSUOutputStream.h" #include "JSystem/JSupport/JSURandomOutputStream.h" #include -#include +#include JSUOutputStream::~JSUOutputStream() { if (!isGood()) { diff --git a/src/JSystem/JUtility/JUTAssert.cpp b/src/JSystem/JUtility/JUTAssert.cpp index 16029f3036..7e36d35df6 100644 --- a/src/JSystem/JUtility/JUTAssert.cpp +++ b/src/JSystem/JUtility/JUTAssert.cpp @@ -4,7 +4,7 @@ #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTDirectPrint.h" -#include +#include #include bool sAssertVisible = true; diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/src/JSystem/JUtility/JUTCacheFont.cpp index f460f315db..dc2a5455dc 100644 --- a/src/JSystem/JUtility/JUTCacheFont.cpp +++ b/src/JSystem/JUtility/JUTCacheFont.cpp @@ -6,7 +6,7 @@ #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JKernel/JKRAram.h" #include "dolphin/gx.h" -#include "stdint.h" +#include JUTCacheFont::JUTCacheFont(ResFONT const* p_fontRes, u32 cacheSize, JKRHeap* p_heap) { initialize_state(); diff --git a/src/JSystem/JUtility/JUTConsole.cpp b/src/JSystem/JUtility/JUTConsole.cpp index 4111950c19..4290c61893 100644 --- a/src/JSystem/JUtility/JUTConsole.cpp +++ b/src/JSystem/JUtility/JUTConsole.cpp @@ -7,7 +7,7 @@ #include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTVideo.h" #include -#include +#include #include "global.h" JUTConsoleManager* JUTConsoleManager::sManager; diff --git a/src/JSystem/JUtility/JUTDbPrint.cpp b/src/JSystem/JUtility/JUTDbPrint.cpp index 5537b321f7..a84c863f26 100644 --- a/src/JSystem/JUtility/JUTDbPrint.cpp +++ b/src/JSystem/JUtility/JUTDbPrint.cpp @@ -4,7 +4,7 @@ #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTVideo.h" -#include +#include JUTDbPrint::JUTDbPrint(JUTFont* pFont, JKRHeap* pHeap) { mFont = pFont; diff --git a/src/JSystem/JUtility/JUTDirectFile.cpp b/src/JSystem/JUtility/JUTDirectFile.cpp index d091d12ad1..ffbff6b2a5 100644 --- a/src/JSystem/JUtility/JUTDirectFile.cpp +++ b/src/JSystem/JUtility/JUTDirectFile.cpp @@ -3,7 +3,7 @@ #include "JSystem/JUtility/JUTDirectFile.h" #include #include "global.h" -#include +#include int JUTDirectFile::fetch32byte() { mToRead = mLength - ALIGN_PREV(mPos, DVD_MIN_TRANSFER_SIZE); diff --git a/src/JSystem/JUtility/JUTDirectPrint.cpp b/src/JSystem/JUtility/JUTDirectPrint.cpp index 799d8ae78b..d0c7387412 100644 --- a/src/JSystem/JUtility/JUTDirectPrint.cpp +++ b/src/JSystem/JUtility/JUTDirectPrint.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JUtility/JUTDirectPrint.h" -#include +#include #include #include "global.h" diff --git a/src/JSystem/JUtility/JUTException.cpp b/src/JSystem/JUtility/JUTException.cpp index 876804d584..32d46c5531 100644 --- a/src/JSystem/JUtility/JUTException.cpp +++ b/src/JSystem/JUtility/JUTException.cpp @@ -4,11 +4,11 @@ #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTDirectFile.h" -#include -#include -#include +#include +#include +#include #include -#include +#include OSMessageQueue JUTException::sMessageQueue = {0}; diff --git a/src/JSystem/JUtility/JUTGamePad.cpp b/src/JSystem/JUtility/JUTGamePad.cpp index ea3709594a..6faf755bae 100644 --- a/src/JSystem/JUtility/JUTGamePad.cpp +++ b/src/JSystem/JUtility/JUTGamePad.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JUtility/JUTGamePad.h" -#include +#include u32 JUTGamePad::CRumble::sChannelMask[4] = { PAD_CHAN0_BIT, diff --git a/src/JSystem/JUtility/JUTGraphFifo.cpp b/src/JSystem/JUtility/JUTGraphFifo.cpp index 98f7db2c39..6553d90453 100644 --- a/src/JSystem/JUtility/JUTGraphFifo.cpp +++ b/src/JSystem/JUtility/JUTGraphFifo.cpp @@ -2,7 +2,7 @@ #include "JSystem/JUtility/JUTGraphFifo.h" #include "JSystem/JKernel/JKRHeap.h" -#include "stdint.h" +#include static bool data_804514B8; diff --git a/src/JSystem/JUtility/JUTNameTab.cpp b/src/JSystem/JUtility/JUTNameTab.cpp index 7ad26bf58e..3b6ed448e0 100644 --- a/src/JSystem/JUtility/JUTNameTab.cpp +++ b/src/JSystem/JUtility/JUTNameTab.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JUtility/JUTNameTab.h" -#include "string.h" +#include JUTNameTab::JUTNameTab() { setResource(NULL); diff --git a/src/JSystem/JUtility/JUTProcBar.cpp b/src/JSystem/JUtility/JUTProcBar.cpp index 235132832b..c9599868bc 100644 --- a/src/JSystem/JUtility/JUTProcBar.cpp +++ b/src/JSystem/JUtility/JUTProcBar.cpp @@ -4,7 +4,7 @@ #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTVideo.h" -#include +#include JUTProcBar::JUTProcBar() { mVisible = true; diff --git a/src/JSystem/JUtility/JUTResource.cpp b/src/JSystem/JUtility/JUTResource.cpp index 9d74852f58..80eb6a8e5f 100644 --- a/src/JSystem/JUtility/JUTResource.cpp +++ b/src/JSystem/JUtility/JUTResource.cpp @@ -3,7 +3,7 @@ #include "JSystem/JUtility/JUTResource.h" #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JSupport/JSUInputStream.h" -#include "string.h" +#include void* JUTResReference::getResource(JSUInputStream* stream, u32 resType, JKRArchive* archive) { stream->read(&mType, 1); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm similarity index 98% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm index 8a1ef98eb3..d0903fc69d 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm @@ -1,9 +1,9 @@ #ifndef MSL_ALGORITHM_H_ #define MSL_ALGORITHM_H_ -#include -#include -#include +#include +#include +#include #include "global.h" namespace std { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset similarity index 97% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset index f6bb7354f7..e3b01b3435 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset @@ -1,9 +1,9 @@ #ifndef MSL_BITSET_H_ #define MSL_BITSET_H_ -#include "stdio.h" -#include "stdlib.h" -#include "algorithm.h" +#include +#include +#include namespace std { // TODO: where does this go? diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/functional.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/functional similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/functional.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/functional diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator similarity index 99% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator index 89bc271d5a..778d0c30ae 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator @@ -1,7 +1,7 @@ #ifndef MSL_ITERATOR_H_ #define MSL_ITERATOR_H_ -#include +#include namespace std { struct input_iterator_tag {}; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits similarity index 98% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits index 91c3dedf0e..75f643aa61 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits @@ -1,7 +1,7 @@ #ifndef _MSL_LIMITS_H #define _MSL_LIMITS_H -#include +#include #include namespace std { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/msl_memory.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/memory similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/msl_memory.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/memory diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new similarity index 85% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new index 62446b959e..414c6fd5be 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new @@ -1,7 +1,7 @@ #ifndef STD_NEW_H_ #define STD_NEW_H_ -#include +#include inline void* (operator new)(size_t, void *ptr) { return ptr; } diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint similarity index 93% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint index 157c4180b7..caf108094b 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint @@ -1,7 +1,7 @@ #ifndef MSL_STDINT_H_ #define MSL_STDINT_H_ -#include +#include #ifdef __cplusplus using std::uint8_t; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits similarity index 99% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits index 14c7f35734..720115c1e1 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits @@ -1,7 +1,7 @@ #ifndef MSL_TYPE_TRAITS_H_ #define MSL_TYPE_TRAITS_H_ -#include +#include namespace std { // helper class diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/utility.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/utility similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/utility.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/utility diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h index ce7410884c..fdd13966d4 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_ANSI_FILES_H #define _MSL_COMMON_ANSI_FILES_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h index eabc120a1c..e9271066b5 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_BUFFER_IO_H #define _MSL_COMMON_BUFFER_IO_H -#include +#include enum { __align_buffer, __dont_align_buffer }; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg similarity index 73% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg index 5f54f9a6f9..cb2c57977e 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg @@ -1,6 +1,6 @@ #ifndef _MSL_CSTDARG_H_ #define _MSL_CSTDARG_H_ -#include +#include #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio similarity index 85% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio index 2a966f076a..739a62f641 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio @@ -6,8 +6,8 @@ #include #include #include -#include -#include +#include +#include #define stdin (&__files._stdin) #define stdout (&__files._stdout) diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring similarity index 97% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring index 2290c183cb..c55307fb71 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring @@ -1,7 +1,7 @@ #ifndef _MSL_CSTRING_H #define _MSL_CSTRING_H -#include +#include #include #include diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype similarity index 99% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype index 8ae87d0401..5def2776ff 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype @@ -34,7 +34,7 @@ extern unsigned char __upper_map[]; // added underscore to avoid naming conflicts inline int _tolower(int c) { return (c == -1 ? -1 : (int)__lower_map[(unsigned char)c]); } #else -#include +#include extern const unsigned char __lower_mapC[0x100]; extern const unsigned char __upper_mapC[0x100]; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h index 7adcede674..f6702aa064 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_EXTRAS_H #define _MSL_COMMON_EXTRAS_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale similarity index 99% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale index fa317f2837..717d128b0e 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale @@ -1,7 +1,7 @@ #ifndef _MSL_LOCALE_H #define _MSL_LOCALE_H -#include +#include typedef int (*__decode_mbyte) (wchar_t*, const char*, size_t); typedef int (*__encode_mbyte) (char*, wchar_t); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math similarity index 97% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math index ad27789b8b..de9c0a6bc2 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math @@ -1,7 +1,7 @@ #ifndef MSL_MATH_H_ #define MSL_MATH_H_ -#include +#include namespace std { template diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h index 94f32a9e35..5e9eaee242 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_MEM_FUNCS_H #define _MSL_COMMON_MEM_FUNCS_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h index 9c76f61882..d8322efb06 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h @@ -2,7 +2,7 @@ #define _MSL_COMMON_PRINTF_H #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg similarity index 88% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg index 849ca8be5a..54628ea6ea 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg @@ -1,7 +1,7 @@ #ifndef _MSL_STDARG_H_ #define _MSL_STDARG_H_ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef similarity index 89% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef index 69fc7cf83f..a960525303 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef @@ -1,7 +1,7 @@ #ifndef _MSL_STDDEF_H_ #define _MSL_STDDEF_H_ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio similarity index 86% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio index 950bead4cc..8526a010ff 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio @@ -1,9 +1,9 @@ #ifndef MSL_STDIO_H_ #define MSL_STDIO_H_ -#include -#include -#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib similarity index 92% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib index 409d5598f8..3d8239713a 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib @@ -1,7 +1,7 @@ #ifndef _MSL_STDLIB_H_ #define _MSL_STDLIB_H_ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string similarity index 95% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string index e478d7e8eb..41984de8b5 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string @@ -1,7 +1,7 @@ #ifndef MSL_STRING_H_ #define MSL_STRING_H_ -#include +#include namespace std { using ::memcpy; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h index fd011d70d1..a08f44ea29 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h @@ -1,7 +1,7 @@ #ifndef _MSL_WCTYPE_H #define _MSL_WCTYPE_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h index 7cd6e26b55..8fbf40231b 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h @@ -1,7 +1,7 @@ #ifndef MSL_WSTRING_H #define MSL_WSTRING_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c index 230f504a6f..c399b82827 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c @@ -1,6 +1,6 @@ #include "abort_exit.h" #include "critical_regions.h" -#include "cstddef.h" +#include extern void (*_dtors[])(void); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c index a50c8913aa..5d933cf0c3 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c @@ -1,6 +1,6 @@ #include "alloc.h" #include "critical_regions.h" -#include +#include #include "global.h" diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c index 4bc8cd4a7e..967879ace0 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c @@ -1,5 +1,5 @@ -#include "locale.h" +#include #include "global.h" @@ -7,7 +7,7 @@ #undef MSL_INLINE #define MSL_INLINE __declspec(weak) -#include "ctype.h" +#include #if PLATFORM_GCN #define ctrl __control_char diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c index d24ac7b5ea..9d68210dc2 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c @@ -1,5 +1,5 @@ #include "extras.h" -#include "ctype.h" +#include int stricmp(const char* str1, const char* str2) { char a_var; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c index fe71593f35..c73b270039 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c @@ -1,5 +1,5 @@ #include "file_io.h" -#include "ctype.h" +#include int fclose(FILE* file) { int flush_result, close_result; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c index 3826686f22..1917c23b63 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c index 690e3dd71c..e7a388e062 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c @@ -4,4 +4,4 @@ #undef MSL_INLINE #define MSL_INLINE __declspec(weak) -#include +#include diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c index 17e30a364e..2b03a829f4 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c @@ -1,6 +1,6 @@ #include "mbstring.h" -#include "cstring.h" -#include +#include +#include #include "global.h" diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c index f2ea575cce..a3ffdd25a1 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c @@ -1,4 +1,4 @@ -#include "cstring.h" +#include void* memmove(void* dst, const void* src, size_t n) { const char* csrc; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c index 0c2856e046..83305984e1 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c @@ -1,12 +1,12 @@ #include "printf.h" #include "ansi_fp.h" #include "critical_regions.h" -#include "ctype.h" +#include #include "scanf.h" -#include "cmath.h" -#include "cstdio.h" -#include "cstring.h" -#include "cstdint.h" +#include +#include +#include +#include #include "wchar_io.h" #define LDBL_MANT_DIG 53 diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c index e2016b1d41..b60a21131c 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c @@ -1,8 +1,8 @@ #include "scanf.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c index faf85586d6..1cc3d7ee16 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c @@ -1,4 +1,4 @@ -#include +#include typedef void (*constraint_handler_t)(const char*, void*, int); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c index 7c9ded40f1..ff5f9dd6a9 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c @@ -1,4 +1,4 @@ -#include "cstring.h" +#include #include "global.h" #define K1 0x80808080 diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c index b4599b1e75..444ceed800 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c @@ -1,11 +1,11 @@ #include "strtold.h" -#include "cstdio.h" +#include #include "ansi_fp.h" -#include "locale.h" -#include "ctype.h" +#include +#include #include "float.h" -#include "cmath.h" -#include "climits.h" +#include +#include #include extern double nan(const char*); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c index 3d3136e397..cb65203382 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c @@ -1,7 +1,7 @@ #include "strtoul.h" -#include "ctype.h" +#include #include "errno.h" -#include "climits.h" +#include #include "scanf.h" enum scan_states { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c index 73e8f15d71..7faf351f1c 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c @@ -1,4 +1,4 @@ -#include "ctype.h" +#include const unsigned short __wctype_mapC[256] = { ctype_cntrl, diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c index 9588c00582..e56c8f9295 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c @@ -34,7 +34,7 @@ * Function needed: sqrt */ -#include "cmath.h" +#include #ifdef __STDC__ static const double diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c index 05c49cee7e..4bbf550c22 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c @@ -40,7 +40,7 @@ * */ -#include "cmath.h" +#include #ifdef __STDC__ static const double diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c index 0fe4053e3d..4a72bebf1f 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c @@ -56,7 +56,7 @@ */ #include "errno.h" -#include "cmath.h" +#include #ifdef __STDC__ static const double diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c index b3db70acde..19f30a6123 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c @@ -81,7 +81,7 @@ */ #include "errno.h" -#include "cmath.h" +#include #ifdef __STDC__ static const double one = 1.0, tiny = 1.0e-300; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c index c7eb4edc5d..2eff01e529 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c @@ -99,7 +99,7 @@ * = 1 - 2*(tan(y) - (tan(y)^2)/(1+tan(y))) */ -#include "cmath.h" +#include static const double one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ pio4 = 7.85398163397448278999e-01, /* 0x3FE921FB, 0x54442D18 */ pio4lo = 3.06161699786838301793e-17, /* 0x3C81A626, 0x33145C07 */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c index 3fe3aea68b..4a5a76e563 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c @@ -14,7 +14,7 @@ #include "global.h" #if PLATFORM_GCN -#include "cmath.h" /* for isfinite macro */ +#include /* for isfinite macro */ #else #include #define isfinite(x) ((__fpclassifyd(x) > 2)) diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c index 879effbd02..e057f9efe7 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c @@ -1,7 +1,7 @@ #include "ansi_fp.h" #include "ansi_fp.h" -#include "climits.h" -#include "cmath.h" +#include +#include static int __count_trailing_zerol(unsigned long x) { int result = 0; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c index aba9df81ed..68722043cc 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c @@ -1,4 +1,4 @@ -#include +#include double scalbn(double x, int n) { double mant; diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h b/src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h index 36b6f440dd..a5542f9c99 100644 --- a/src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h +++ b/src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h @@ -1,7 +1,7 @@ #ifndef MWCPLUSLIB_H #define MWCPLUSLIB_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c b/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c index badb510ee8..4ad6a4e66f 100644 --- a/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c +++ b/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include #undef __va_arg diff --git a/src/SSystem/SComponent/c_lib.cpp b/src/SSystem/SComponent/c_lib.cpp index c9646531c7..4440acbc07 100644 --- a/src/SSystem/SComponent/c_lib.cpp +++ b/src/SSystem/SComponent/c_lib.cpp @@ -4,7 +4,7 @@ */ #include "SSystem/SComponent/c_lib.h" -#include "string.h" +#include #include "SSystem/SComponent/c_math.h" /** diff --git a/src/SSystem/SComponent/c_math.cpp b/src/SSystem/SComponent/c_math.cpp index 49866b3684..f590bc9bba 100644 --- a/src/SSystem/SComponent/c_math.cpp +++ b/src/SSystem/SComponent/c_math.cpp @@ -5,7 +5,7 @@ #include "SSystem/SComponent/c_math.h" #include "SSystem/SComponent/c_m3d.h" -#include +#include s16 cM_rad2s(f32 rad) { s32 s = (std::fmod(rad, 2 * M_PI) * (0x8000 / M_PI)); diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c index a30ab8c7a8..36473080f0 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c @@ -4,7 +4,7 @@ */ #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h" -#include +#include #pragma dont_inline on void TRK_fill_mem(void* dst, int val, u32 n) { diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c index 094ec4c2bd..36a33d75fa 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c @@ -2,7 +2,7 @@ #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent.h" #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h" #include "trk.h" -#include +#include static BOOL IsTRKConnected; diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c index 1afc4a68cc..b386f7cdbe 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c @@ -1,7 +1,7 @@ #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/support.h" #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h" #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h" -#include +#include DSError TRKSuppAccessFile(u32 file_handle, u8* data, size_t* count, DSIOResult* io_result, BOOL need_reply, BOOL read) { diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c index 76fef30a46..becb062ca8 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c @@ -1,7 +1,7 @@ #include "TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.h" #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h" -#include -#include +#include +#include typedef struct memRange { u8* start; diff --git a/src/Z2AudioLib/Z2Calc.cpp b/src/Z2AudioLib/Z2Calc.cpp index 91eccdcfb6..3f0ab802e0 100644 --- a/src/Z2AudioLib/Z2Calc.cpp +++ b/src/Z2AudioLib/Z2Calc.cpp @@ -1,6 +1,6 @@ #include "Z2AudioLib/Z2Calc.h" #include "JSystem/JMath/random.h" -#include +#include f32 Z2Calc::linearTransform(f32 inValue, f32 inMin, f32 inMax, f32 outMin, f32 outMax, bool noClamp) { f32 transformed = outMin + ((inValue - inMin) * ((outMax - outMin) / (inMax - inMin))); diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index 6513781efe..a99c2ea721 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -16,7 +16,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" #include "c/c_damagereaction.h" -#include +#include enum B_bq_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index 09b761d637..4600e64c7f 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_tn.h" -#include +#include #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_boomerang.h" #include "d/actor/d_a_nbomb.h" diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index ea53c4d7be..ed9383a6e9 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -17,7 +17,7 @@ #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" #include "JSystem/JAudio2/JAUSectionHeap.h" -#include +#include enum Joint { /* 0x00 */ JNT_CENTER, diff --git a/src/d/actor/d_a_b_zant_magic.cpp b/src/d/actor/d_a_b_zant_magic.cpp index d94326b6b2..83482ffd36 100644 --- a/src/d/actor/d_a_b_zant_magic.cpp +++ b/src/d/actor/d_a_b_zant_magic.cpp @@ -10,7 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_math.h" -#include +#include int daB_ZANTM_c::draw() { g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); diff --git a/src/d/actor/d_a_b_zant_mobile.cpp b/src/d/actor/d_a_b_zant_mobile.cpp index c67b00498e..282bec5900 100644 --- a/src/d/actor/d_a_b_zant_mobile.cpp +++ b/src/d/actor/d_a_b_zant_mobile.cpp @@ -11,7 +11,7 @@ #include "d/d_cc_uty.h" #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_math.h" -#include +#include namespace { dCcD_SrcSph cc_zant_src = { diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index 6fee7b6dde..cc3b88375b 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_bg_obj.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" -#include +#include #include "dolphin/os.h" #include "d/actor/d_a_set_bgobj.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_door_dbdoor00.cpp b/src/d/actor/d_a_door_dbdoor00.cpp index 4c1e8e8c5e..0f0f827d0c 100644 --- a/src/d/actor/d_a_door_dbdoor00.cpp +++ b/src/d/actor/d_a_door_dbdoor00.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_door_dbdoor00.h" -#include "printf.h" +#include #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" #include "d/d_door_param2.h" diff --git a/src/d/actor/d_a_door_knob00.cpp b/src/d/actor/d_a_door_knob00.cpp index dec122fa0c..05958a9b45 100644 --- a/src/d/actor/d_a_door_knob00.cpp +++ b/src/d/actor/d_a_door_knob00.cpp @@ -11,7 +11,7 @@ #include "d/actor/d_a_player.h" #include "d/d_meter2_info.h" #include "SSystem/SComponent/c_math.h" -#include "printf.h" +#include u32 knob_param_c::getDoorModel(fopAc_ac_c* i_this) { return fopAcM_GetParamBit(i_this, 5, 3); diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index 4bf468af08..4689faed0a 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -14,7 +14,7 @@ #include "d/d_msg_object.h" #include "d/d_map_path_dmap.h" #include "SSystem/SComponent/c_math.h" -#include "printf.h" +#include char* daDoor20_c::getStopBmdName() { switch (door_param2_c::getKind(this)) { diff --git a/src/d/actor/d_a_e_dk.cpp b/src/d/actor/d_a_e_dk.cpp index 0f13d897a4..b8f5114d6d 100644 --- a/src/d/actor/d_a_e_dk.cpp +++ b/src/d/actor/d_a_e_dk.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" -#include +#include #define ACTION_MODE_WAIT 0 #define ACTION_MODE_CHASE 1 diff --git a/src/d/actor/d_a_e_sw.cpp b/src/d/actor/d_a_e_sw.cpp index 6f2ccf382c..1a8a58b611 100644 --- a/src/d/actor/d_a_e_sw.cpp +++ b/src/d/actor/d_a_e_sw.cpp @@ -9,7 +9,7 @@ #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" #include "d/d_bomb.h" -#include +#include #include "Z2AudioLib/Z2Instances.h" class daE_SW_HIO_c { diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index e3e0b9de5f..c43e04cb25 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -9,7 +9,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" #include "c/c_damagereaction.h" -#include +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_e_ws.cpp b/src/d/actor/d_a_e_ws.cpp index 2a9920ddd4..fefe58fd45 100644 --- a/src/d/actor/d_a_e_ws.cpp +++ b/src/d/actor/d_a_e_ws.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_e_ws.h" #include "d/actor/d_a_obj_carry.h" -#include +#include #include "f_op/f_op_actor_enemy.h" class daE_WS_HIO_c : public JORReflexible { diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp index 750a6ea406..956a31bc88 100644 --- a/src/d/actor/d_a_e_ymb.cpp +++ b/src/d/actor/d_a_e_ymb.cpp @@ -11,7 +11,7 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_camera_mng.h" -#include +#include #include "Z2AudioLib/Z2Instances.h" struct daE_YMB_HIO_c { diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index 83fe7c78d2..33a079524c 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -10,7 +10,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" #include "Z2AudioLib/Z2Instances.h" -#include +#include #include "d/actor/d_grass.inc" // IWYU pragma: keep #include "d/actor/d_flower.inc" diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index a99b8d4b8f..f77b11be6c 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -17,7 +17,7 @@ #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" #include "JSystem/JAudio2/JAUSectionHeap.h" -#include +#include #define ANM_HS_BACK_WALK 6 #define ANM_HS_WALK_START 7 diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index b863c19ba9..b9909276b2 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -10,7 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/d_msg_object.h" -#include +#include #include "d/actor/d_a_balloon_2D.h" #include "d/actor/d_a_e_ym.h" diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index bdac3c86c4..f46f0c237e 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -22,7 +22,7 @@ #include "c/c_damagereaction.h" #include "SSystem/SComponent/c_counter.h" #include "Z2AudioLib/Z2Instances.h" -#include +#include class dmg_rod_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index b9cb555a42..e81a8a2b8c 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -11,7 +11,7 @@ #include "SSystem/SComponent/c_m3d_g_pla.h" #include "Z2AudioLib/Z2Instances.h" #include "c/c_damagereaction.h" -#include +#include #include "d/actor/d_a_alink.h" #include "d/actor/d_a_canoe.h" #include "d/actor/d_a_mg_fshop.h" diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index 8c1f7d9525..b4009d49bf 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -1328,7 +1328,7 @@ int daNpc_Taro_c::cutSwdTutorial(int param_1) { break; } } - int local_68[2] = {-1, 0xffffffff}; + int local_68[2] = {-1, -1}; switch (local_70) { case 0: mJntAnm.lookPlayer(0); diff --git a/src/d/actor/d_a_obj_bhbridge.cpp b/src/d/actor/d_a_obj_bhbridge.cpp index 0697f830c3..59e2ed6fd5 100644 --- a/src/d/actor/d_a_obj_bhbridge.cpp +++ b/src/d/actor/d_a_obj_bhbridge.cpp @@ -11,7 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "d/actor/d_a_player.h" -#include +#include void daObjBhbridge_c::RideOn_Angle(s16& param_1, f32 param_2, s16 param_3, f32 param_4) { cLib_addCalcAngleS(¶m_1, param_3 * (param_2 / param_4), 1, 0x100, 1); diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp index cb4b785a34..e3960aebce 100644 --- a/src/d/actor/d_a_obj_carry.cpp +++ b/src/d/actor/d_a_obj_carry.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_carry.h" #include "d/actor/d_a_player.h" -#include +#include #include "d/d_com_inf_game.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_obj_swBallA.h" diff --git a/src/d/actor/d_a_obj_cwall.cpp b/src/d/actor/d_a_obj_cwall.cpp index 87d7158cd7..7a54788e6b 100644 --- a/src/d/actor/d_a_obj_cwall.cpp +++ b/src/d/actor/d_a_obj_cwall.cpp @@ -12,7 +12,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" -#include +#include void daObjCwall_c::initBaseMtx() { mWallModel->setBaseScale(scale); diff --git a/src/d/actor/d_a_obj_digsnow.cpp b/src/d/actor/d_a_obj_digsnow.cpp index 9a1335844d..62f3922ee6 100644 --- a/src/d/actor/d_a_obj_digsnow.cpp +++ b/src/d/actor/d_a_obj_digsnow.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_digsnow.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include +#include void daObjDigSnow_c::initBaseMtx() { mpModel->setBaseScale(scale); diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index 85f5564e4c..1ee2d25856 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_drop.h" #include "SSystem/SComponent/c_math.h" -#include +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_camera.h" diff --git a/src/d/actor/d_a_obj_gra2_soldier.inc b/src/d/actor/d_a_obj_gra2_soldier.inc index f8b1870f67..879062983f 100644 --- a/src/d/actor/d_a_obj_gra2_soldier.inc +++ b/src/d/actor/d_a_obj_gra2_soldier.inc @@ -1,7 +1,7 @@ #include "d/actor/d_a_obj_gra2.h" #include "d/d_camera.h" #include "d/actor/d_a_tag_gra.h" -#include +#include f32 daObj_GrA_c::getSrchCircleR() { f32 srchCircleR; diff --git a/src/d/actor/d_a_obj_ice_l.cpp b/src/d/actor/d_a_obj_ice_l.cpp index 46ddd0ed60..396e79fcf9 100644 --- a/src/d/actor/d_a_obj_ice_l.cpp +++ b/src/d/actor/d_a_obj_ice_l.cpp @@ -12,7 +12,7 @@ #include "d/actor/d_a_player.h" #include "d/d_procname.h" #include "d/d_s_play.h" -#include +#include f32 dummyLiteral() { return 0.0f; diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp index f58db9592b..ba8ad44d1f 100644 --- a/src/d/actor/d_a_obj_ice_s.cpp +++ b/src/d/actor/d_a_obj_ice_s.cpp @@ -12,7 +12,7 @@ #include "d/d_s_play.h" #include "SSystem/SComponent/c_lib.h" #include "SSystem/SComponent/c_math.h" -#include +#include class daOBJ_ICE_S_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_obj_kanban2.cpp b/src/d/actor/d_a_obj_kanban2.cpp index e2a5a08b3c..9bab3f6ea2 100644 --- a/src/d/actor/d_a_obj_kanban2.cpp +++ b/src/d/actor/d_a_obj_kanban2.cpp @@ -11,7 +11,7 @@ #include "d/actor/d_a_npc_tk.h" #include "d/d_s_play.h" #include "Z2AudioLib/Z2Instances.h" -#include +#include #define PARTS_ALL 0x3FFFF #define PART_TOP_LEFT_UNDER (1 << 0) diff --git a/src/d/actor/d_a_obj_lv4digsand.cpp b/src/d/actor/d_a_obj_lv4digsand.cpp index 8b90c751a2..9aab3a1190 100644 --- a/src/d/actor/d_a_obj_lv4digsand.cpp +++ b/src/d/actor/d_a_obj_lv4digsand.cpp @@ -9,7 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" #include "d/d_item.h" -#include +#include void daObjL4DigSand_c::initBaseMtx() { mpModel->setBaseScale(scale); diff --git a/src/d/actor/d_a_obj_pdoor.cpp b/src/d/actor/d_a_obj_pdoor.cpp index fe71c9fca2..91c6f80b4a 100644 --- a/src/d/actor/d_a_obj_pdoor.cpp +++ b/src/d/actor/d_a_obj_pdoor.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_lib.h" #include "SSystem/SComponent/c_math.h" -#include +#include #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp index 95505cbfb0..c10e53e2be 100644 --- a/src/d/actor/d_a_obj_shield.cpp +++ b/src/d/actor/d_a_obj_shield.cpp @@ -11,7 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_cc_d.h" #include "d/d_item_data.h" -#include +#include const static dCcD_SrcCyl l_cyl_src = { { diff --git a/src/d/actor/d_a_obj_stone.cpp b/src/d/actor/d_a_obj_stone.cpp index 488436c5ee..852361498a 100644 --- a/src/d/actor/d_a_obj_stone.cpp +++ b/src/d/actor/d_a_obj_stone.cpp @@ -14,7 +14,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "global.h" #include "SSystem/SComponent/c_math.h" -#include +#include const static int l_bmdIdx[2] = {3, 3}; diff --git a/src/d/actor/d_a_obj_swturn.cpp b/src/d/actor/d_a_obj_swturn.cpp index 3d2f64299d..909b94da11 100644 --- a/src/d/actor/d_a_obj_swturn.cpp +++ b/src/d/actor/d_a_obj_swturn.cpp @@ -11,7 +11,7 @@ #include "SSystem/SComponent/c_lib.h" #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" -#include +#include static u32 const l_bmd[2] = { 4, 4, diff --git a/src/d/actor/d_a_obj_wdStick.cpp b/src/d/actor/d_a_obj_wdStick.cpp index 1949c2f395..0e4abd5d4c 100644 --- a/src/d/actor/d_a_obj_wdStick.cpp +++ b/src/d/actor/d_a_obj_wdStick.cpp @@ -10,7 +10,7 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_kankyo_mng.h" -#include +#include static daWdStick_HIO_c l_HIO; diff --git a/src/d/actor/d_a_set_bgobj.cpp b/src/d/actor/d_a_set_bgobj.cpp index 9aafaa6e2f..f072a3f6a9 100644 --- a/src/d/actor/d_a_set_bgobj.cpp +++ b/src/d/actor/d_a_set_bgobj.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_set_bgobj.h" -#include +#include #include "f_op/f_op_actor_mng.h" static const char l_specName[] = "spec.dat"; diff --git a/src/d/actor/d_a_tag_camera.cpp b/src/d/actor/d_a_tag_camera.cpp index 99c2c69f6b..ee95c98107 100644 --- a/src/d/actor/d_a_tag_camera.cpp +++ b/src/d/actor/d_a_tag_camera.cpp @@ -1,7 +1,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_camera.h" -#include +#include #include "d/actor/d_a_alink.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_horse.h" diff --git a/src/d/actor/d_a_tag_chkpoint.cpp b/src/d/actor/d_a_tag_chkpoint.cpp index a033afdfe0..06f2a51779 100644 --- a/src/d/actor/d_a_tag_chkpoint.cpp +++ b/src/d/actor/d_a_tag_chkpoint.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_chkpoint.h" -#include +#include #include "d/actor/d_a_player.h" int daTag_Chk_c::execute() { diff --git a/src/d/actor/d_a_tag_firewall.cpp b/src/d/actor/d_a_tag_firewall.cpp index 7b77433fbb..fa6470cdda 100644 --- a/src/d/actor/d_a_tag_firewall.cpp +++ b/src/d/actor/d_a_tag_firewall.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_firewall.h" -#include +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_bomb.h" diff --git a/src/d/actor/d_a_tag_kmsg.cpp b/src/d/actor/d_a_tag_kmsg.cpp index 7e0681ec52..1588e5a9c2 100644 --- a/src/d/actor/d_a_tag_kmsg.cpp +++ b/src/d/actor/d_a_tag_kmsg.cpp @@ -4,7 +4,7 @@ #include "d/actor/d_a_npc.h" #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_counter.h" -#include "string.h" +#include struct EventListItem { char* mEventName; diff --git a/src/d/actor/d_a_tag_sppath.cpp b/src/d/actor/d_a_tag_sppath.cpp index 96955e7610..e736d8d82e 100644 --- a/src/d/actor/d_a_tag_sppath.cpp +++ b/src/d/actor/d_a_tag_sppath.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_tag_sppath.h" #include "d/actor/d_a_player.h" -#include +#include static dCcD_SrcCyl l_cylSrc = { { diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index a0149a3d19..117c9b02ba 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -9,7 +9,7 @@ #include "f_op/f_op_camera_mng.h" #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" -#include +#include static const f32 l_cull_size_box[6] = { -150.0f, -10.0f, -150.0f, 150.0f, 300.0f, 100.0f }; diff --git a/src/d/d_bg_w_kcol.cpp b/src/d/d_bg_w_kcol.cpp index 91e9884f24..8c39fa39aa 100644 --- a/src/d/d_bg_w_kcol.cpp +++ b/src/d/d_bg_w_kcol.cpp @@ -5,8 +5,8 @@ #include "d/actor/d_a_horse.h" #include "d/d_bg_s_cap_poly.h" -#include -#include +#include +#include #include "SSystem/SComponent/c_bg_s_shdw_draw.h" #include "SSystem/SComponent/c_m2d.h" diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 9fca792bc5..00acd50d42 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -3,7 +3,7 @@ #include "d/d_camera.h" #include "SSystem/SComponent/c_counter.h" #include "SSystem/SComponent/c_math.h" -#include +#include #include "d/actor/d_a_alink.h" #include "d/actor/d_a_boomerang.h" #include "d/actor/d_a_horse.h" @@ -21,7 +21,7 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" -#include +#include namespace { diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 2f22a58de1..87708c6dca 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -22,7 +22,7 @@ #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -#include +#include void dComIfG_play_c::ct() { mWindowNum = 0; diff --git a/src/d/d_com_static.cpp b/src/d/d_com_static.cpp index 461f182719..f3bace3685 100644 --- a/src/d/d_com_static.cpp +++ b/src/d/d_com_static.cpp @@ -12,7 +12,7 @@ #include "d/actor/d_a_tag_magne.h" #include "d/actor/d_a_tag_mist.h" #include "d/actor/d_a_tag_stream.h" -#include +#include void daSus_c::data_c::set(s8 i_roomNo, cXyz const& param_1, cXyz const& param_2, u8 param_3, u8 param_4, u8 i_type) { diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index 51b082baf7..df9a133bec 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -9,7 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/d_path.h" #include "f_op/f_op_camera_mng.h" -#include "string.h" +#include static int dEnvSe_Draw(dEnvSe_c* i_this) { return 1; diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp index 5cf7749878..9bfc896a71 100644 --- a/src/d/d_error_msg.cpp +++ b/src/d/d_error_msg.cpp @@ -5,7 +5,7 @@ #include "d/dolzel.h" // IWYU pragma: keep -#include +#include #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/J2DGraph/J2DPicture.h" #include "JSystem/J2DGraph/J2DTextBox.h" diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index ab346a899d..41b31b5837 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -13,7 +13,7 @@ #include "d/d_demo.h" #include "d/d_s_play.h" #include "SSystem/SComponent/c_counter.h" -#include +#include #if DEBUG static dEvM_HIO_c l_HIO; diff --git a/src/d/d_file_sel_info.cpp b/src/d/d_file_sel_info.cpp index c723c99376..642ccc6764 100644 --- a/src/d/d_file_sel_info.cpp +++ b/src/d/d_file_sel_info.cpp @@ -11,7 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" #include "d/d_pane_class_alpha.h" -#include +#include dFile_info_c::dFile_info_c(JKRArchive* i_archive, u8 param_1) { mArchive = i_archive; diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 4a5233faa4..209de4cd58 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -24,7 +24,7 @@ #include "f_op/f_op_kankyo.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" -#include +#include static void GxXFog_set(); diff --git a/src/d/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp index bcdbb5412e..8acb561fde 100644 --- a/src/d/d_kankyo_wether.cpp +++ b/src/d/d_kankyo_wether.cpp @@ -12,7 +12,7 @@ #include "d/d_kankyo.h" #include "d/d_kankyo_rain.h" #include "f_op/f_op_camera_mng.h" -#include "string.h" +#include #include "m_Do/m_Do_audio.h" static void dKyw_pntlight_set(WIND_INFLUENCE* pntwind); diff --git a/src/d/d_menu_dmap_map.cpp b/src/d/d_menu_dmap_map.cpp index 80278dda50..468b2c2f17 100644 --- a/src/d/d_menu_dmap_map.cpp +++ b/src/d/d_menu_dmap_map.cpp @@ -4,7 +4,7 @@ #include "d/dolzel.h" // IWYU pragma: keep -#include +#include #include "d/d_com_inf_game.h" #include "d/d_map_path_dmap.h" #include "d/d_menu_dmap.h" diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp index 1fb29a54ce..b9b22f841b 100644 --- a/src/d/d_menu_fmap.cpp +++ b/src/d/d_menu_fmap.cpp @@ -5,7 +5,7 @@ #include "JSystem/JKernel/JKRAramArchive.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" -#include +#include #include "f_op/f_op_msg_mng.h" #include "d/d_com_inf_game.h" #include "d/d_lib.h" diff --git a/src/d/d_menu_insect.cpp b/src/d/d_menu_insect.cpp index 6b847ef8ee..953cd73589 100644 --- a/src/d/d_menu_insect.cpp +++ b/src/d/d_menu_insect.cpp @@ -19,7 +19,7 @@ #include "d/d_msg_string.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -#include +#include typedef void (dMenu_Insect_c::*initFunc)(); static initFunc map_init_process[] = { diff --git a/src/d/d_menu_item_explain.cpp b/src/d/d_menu_item_explain.cpp index 8ef451074a..cc901b9a72 100644 --- a/src/d/d_menu_item_explain.cpp +++ b/src/d/d_menu_item_explain.cpp @@ -9,7 +9,7 @@ #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/JUTTexture.h" -#include +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" diff --git a/src/d/d_menu_letter.cpp b/src/d/d_menu_letter.cpp index 7e45500dc9..57a20807f4 100644 --- a/src/d/d_menu_letter.cpp +++ b/src/d/d_menu_letter.cpp @@ -4,7 +4,7 @@ #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JKernel/JKRMemArchive.h" -#include +#include #include "d/d_com_inf_game.h" #include "d/d_select_cursor.h" #include "d/d_meter2_info.h" diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp index e0bf6c8714..647638768c 100644 --- a/src/d/d_menu_option.cpp +++ b/src/d/d_menu_option.cpp @@ -22,7 +22,7 @@ #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -#include "string.h" +#include typedef void (dMenu_Option_c::*initFunc)(); static initFunc init[] = { diff --git a/src/d/d_menu_ring.cpp b/src/d/d_menu_ring.cpp index 48747da384..4785e46bf0 100644 --- a/src/d/d_menu_ring.cpp +++ b/src/d/d_menu_ring.cpp @@ -25,9 +25,9 @@ #include "d/d_msg_string.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -#include "string.h" +#include -#include +#include typedef void (dMenu_Ring_c::*initFunc)(); static initFunc stick_init[] = { diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp index 1faa35b2ed..b9737e3a4b 100644 --- a/src/d/d_menu_save.cpp +++ b/src/d/d_menu_save.cpp @@ -3,7 +3,7 @@ #include "d/d_menu_save.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" -#include +#include #include "d/d_com_inf_game.h" #include "d/d_lib.h" #include "d/d_select_cursor.h" diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp index 971868b3fa..5be39371cd 100644 --- a/src/d/d_meter2_draw.cpp +++ b/src/d/d_meter2_draw.cpp @@ -20,7 +20,7 @@ #include "d/d_msg_class.h" #include "d/d_msg_object.h" #include "d/d_pane_class.h" -#include "string.h" +#include dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { OS_REPORT("enter dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap *mp_heap)\n"); diff --git a/src/d/d_msg_class.cpp b/src/d/d_msg_class.cpp index c7ecc0780a..683b192bb6 100644 --- a/src/d/d_msg_class.cpp +++ b/src/d/d_msg_class.cpp @@ -1,7 +1,7 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_class.h" -#include +#include #include "d/d_meter2_info.h" #include "d/d_msg_object.h" #include "d/d_msg_unit.h" diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index 6e2287a869..f1a9c6945c 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -22,7 +22,7 @@ #include "d/d_meter2.h" #include "d/actor/d_a_midna.h" #include "f_op/f_op_msg_mng.h" -#include +#include #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_lib.h" #include "JSystem/JKernel/JKRExpHeap.h" diff --git a/src/d/d_msg_scrn_3select.cpp b/src/d/d_msg_scrn_3select.cpp index 834919ff1d..557ed12cd9 100644 --- a/src/d/d_msg_scrn_3select.cpp +++ b/src/d/d_msg_scrn_3select.cpp @@ -10,7 +10,7 @@ #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J2DGraph/J2DTextBox.h" -#include "string.h" +#include #include "d/d_com_inf_game.h" #include "d/d_select_cursor.h" #include "d/d_msg_object.h" diff --git a/src/d/d_msg_scrn_base.cpp b/src/d/d_msg_scrn_base.cpp index 11bbadf7c5..43651004d3 100644 --- a/src/d/d_msg_scrn_base.cpp +++ b/src/d/d_msg_scrn_base.cpp @@ -6,7 +6,7 @@ #include "d/d_msg_object.h" #include "d/d_msg_out_font.h" #include "d/d_pane_class.h" -#include "string.h" +#include dMsgScrnBase_c::dMsgScrnBase_c() { init(); diff --git a/src/d/d_msg_scrn_explain.cpp b/src/d/d_msg_scrn_explain.cpp index 01794f419e..a6618cf265 100644 --- a/src/d/d_msg_scrn_explain.cpp +++ b/src/d/d_msg_scrn_explain.cpp @@ -11,7 +11,7 @@ #include "d/d_msg_string.h" #include "d/d_pane_class.h" #include "m_Do/m_Do_controller_pad.h" -#include +#include #if VERSION == VERSION_GCN_JPN #define STR_BUF_LEN 528 diff --git a/src/d/d_msg_unit.cpp b/src/d/d_msg_unit.cpp index 1b1dfcad4a..0e2447b4b0 100644 --- a/src/d/d_msg_unit.cpp +++ b/src/d/d_msg_unit.cpp @@ -2,7 +2,7 @@ #include "d/d_msg_unit.h" #include "d/d_com_inf_game.h" -#include +#include #include "d/d_kankyo.h" #include "d/d_meter2_info.h" diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index 9dcb14d00a..bd2515ecc3 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -6,7 +6,7 @@ #include "d/d_lib.h" #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_controller_pad.h" -#include +#include #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "f_op/f_op_msg_mng.h" diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index a955d202fe..fec0de589c 100644 --- a/src/d/d_particle.cpp +++ b/src/d/d_particle.cpp @@ -17,7 +17,7 @@ #include "JSystem/JParticle/JPAResourceManager.h" #include "JSystem/JMath/JMATrigonometric.h" #include "d/d_s_play.h" -#include +#include #include "d/d_com_inf_game.h" #include "m_Do/m_Do_lib.h" #include "m_Do/m_Do_graphic.h" diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index a372d5ad57..be4e71b9f3 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -14,7 +14,7 @@ #include "d/d_com_inf_game.h" #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_graphic.h" -#include +#include dRes_info_c::dRes_info_c() { mCount = 0; @@ -44,7 +44,9 @@ dRes_info_c::~dRes_info_c() { int dRes_info_c::set(char const* i_arcName, char const* i_path, u8 i_mountDirection, JKRHeap* i_heap) { char path[40]; +#ifdef __MWERKS__ JUT_ASSERT(120, strlen(i_arcName) <= NAME_MAX); +#endif if (*i_path != NULL) { snprintf(path, sizeof(path), "%s%s.arc", i_path, i_arcName); @@ -334,7 +336,9 @@ int dRes_info_c::loadResource() { const char* name_p = mArchive->mStringTable + entry->getNameOffset(); size_t resNameLen = strlen(name_p) - 4; +#ifdef __MWERKS__ JUT_ASSERT(0x301, resNameLen <= NAME_MAX); +#endif char arcName[9]; strncpy(arcName, name_p, resNameLen); @@ -490,7 +494,9 @@ void dRes_info_c::deleteArchiveRes() { u32 nameOffset = fileEntry->getNameOffset(); const char* fileName = mArchive->mStringTable + nameOffset; size_t resNameLen = strlen(fileName) - 4; +#ifdef __MWERKS__ JUT_ASSERT(0x46C, resNameLen <= NAME_MAX); +#endif char nameBuffer[12]; strncpy(nameBuffer, fileName, resNameLen); diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index da6d9d5918..e86cc5f062 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -19,7 +19,7 @@ #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTReport.h" -#include +#include #if DEBUG void dScnMenu_setItem(int i_slotNo, u8 i_itemNo); diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 9c4bb22f2d..b0b6ad1e19 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -10,7 +10,7 @@ #include "d/d_s_play.h" #include "d/d_s_room.h" #include "m_Do/m_Do_Reset.h" -#include +#include static int dScnRoom_Draw(room_of_scene_class* i_this) { return 1; diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index 9b8f2d1805..99bcced05a 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -13,7 +13,7 @@ #include "d/d_save.h" #include "d/d_save_init.h" #include "f_op/f_op_scene_mng.h" -#include +#include #if PLATFORM_WII || PLATFORM_SHIELD #include diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index cbb907c16d..7c6a9dc2c0 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -17,7 +17,7 @@ #include "f_op/f_op_scene_mng.h" #include "global.h" #include "m_Do/m_Do_Reset.h" -#include +#include void dStage_nextStage_c::set(const char* i_stage, s8 i_roomId, s16 i_point, s8 i_layer, s8 i_wipe, u8 i_speed) { diff --git a/src/d/d_vibration.cpp b/src/d/d_vibration.cpp index 6b5a96362d..d3bd59c5cf 100644 --- a/src/d/d_vibration.cpp +++ b/src/d/d_vibration.cpp @@ -5,7 +5,7 @@ #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_controller_pad.h" #include "SSystem/SComponent/c_math.h" -#include +#include #define RESET_FRAME -99 diff --git a/src/dolphin/card/CARDUnlock.c b/src/dolphin/card/CARDUnlock.c index 124e0c2069..48f64e500a 100644 --- a/src/dolphin/card/CARDUnlock.c +++ b/src/dolphin/card/CARDUnlock.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/dsp/dsp.c b/src/dolphin/dsp/dsp.c index 085cde1f6d..bd38142c8d 100644 --- a/src/dolphin/dsp/dsp.c +++ b/src/dolphin/dsp/dsp.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/dsp/dsp_task.c b/src/dolphin/dsp/dsp_task.c index b1651a0de3..1f11c7123d 100644 --- a/src/dolphin/dsp/dsp_task.c +++ b/src/dolphin/dsp/dsp_task.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gx/GXDisplayList.c b/src/dolphin/gx/GXDisplayList.c index 356cfcb4a9..e0f3892c18 100644 --- a/src/dolphin/gx/GXDisplayList.c +++ b/src/dolphin/gx/GXDisplayList.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gx/GXFifo.c b/src/dolphin/gx/GXFifo.c index 8acdac3688..1ac868a2ec 100644 --- a/src/dolphin/gx/GXFifo.c +++ b/src/dolphin/gx/GXFifo.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/dolphin/gx/GXGeometry.c b/src/dolphin/gx/GXGeometry.c index cbd7a19c40..43c595ee4c 100644 --- a/src/dolphin/gx/GXGeometry.c +++ b/src/dolphin/gx/GXGeometry.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gx/GXInit.c b/src/dolphin/gx/GXInit.c index aceef9f9b5..c22f5acbd8 100644 --- a/src/dolphin/gx/GXInit.c +++ b/src/dolphin/gx/GXInit.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gx/GXMisc.c b/src/dolphin/gx/GXMisc.c index 2138303882..1200461d79 100644 --- a/src/dolphin/gx/GXMisc.c +++ b/src/dolphin/gx/GXMisc.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/dolphin/gx/GXTexture.c b/src/dolphin/gx/GXTexture.c index 8efb2ec06c..1fa9284e8b 100644 --- a/src/dolphin/gx/GXTexture.c +++ b/src/dolphin/gx/GXTexture.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__gx.h" diff --git a/src/dolphin/gx/GXVerifRAS.c b/src/dolphin/gx/GXVerifRAS.c index 4492385851..b6198bfd64 100644 --- a/src/dolphin/gx/GXVerifRAS.c +++ b/src/dolphin/gx/GXVerifRAS.c @@ -1,6 +1,6 @@ #if DEBUG -#include +#include #include diff --git a/src/dolphin/gx/GXVerifXF.c b/src/dolphin/gx/GXVerifXF.c index 70498a3fdd..d48d4b69b6 100644 --- a/src/dolphin/gx/GXVerifXF.c +++ b/src/dolphin/gx/GXVerifXF.c @@ -1,6 +1,6 @@ #if DEBUG -#include +#include #include diff --git a/src/dolphin/os/OSError.c b/src/dolphin/os/OSError.c index 8e0ff3dce5..347efdbc0e 100644 --- a/src/dolphin/os/OSError.c +++ b/src/dolphin/os/OSError.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/os/__ppc_eabi_init.c b/src/dolphin/os/__ppc_eabi_init.c index 5aef392edc..ec33998fa3 100644 --- a/src/dolphin/os/__ppc_eabi_init.c +++ b/src/dolphin/os/__ppc_eabi_init.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index c288353949..592d87ec3c 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -22,7 +22,7 @@ #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_scene_mng.h" #include "m_Do/m_Do_lib.h" -#include +#include #define MAKE_ITEM_PARAMS(itemNo, itemBitNo, param_2, param_3) \ ((itemNo & 0xFF) << 0x0 | (itemBitNo & 0xFF) << 0x8 | (param_2 & 0xFF) << 0x10 | (param_3 & 0xF) << 0x18) diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp index 010b986c00..25c4bc529f 100644 --- a/src/m_Do/m_Do_MemCardRWmng.cpp +++ b/src/m_Do/m_Do_MemCardRWmng.cpp @@ -8,7 +8,7 @@ #include "JSystem/JUtility/JUTTexture.h" #include "d/d_com_inf_game.h" #include "d/d_save.h" -#include +#include #if VERSION == VERSION_GCN_JPN #define HEADER_TITLE "ゼルダの伝説 ﾄﾜｲﾗｲﾄﾌﾟﾘﾝｾｽ" diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 833a5558a0..c1adb5a8ec 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -22,7 +22,7 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_main.h" #include "m_Do/m_Do_mtx.h" -#include +#include namespace m_Do_ext { u8 CurrentHeapAdjustVerbose; diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 5ab5fa334b..311685d165 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -33,7 +33,7 @@ #include "m_Do/m_Do_printf.h" #include "m_Do/m_Do_ext2.h" #include "SSystem/SComponent/c_counter.h" -#include +#include #if PLATFORM_WII || PLATFORM_SHIELD #include diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp index 3f6ca18008..fe55ea10c9 100644 --- a/src/m_Do/m_Do_printf.cpp +++ b/src/m_Do/m_Do_printf.cpp @@ -4,7 +4,7 @@ */ #include "m_Do/m_Do_printf.h" -#include +#include #include #include "m_Do/m_Do_ext.h" diff --git a/src/revolution/aralt/aralt.c b/src/revolution/aralt/aralt.c index 1ec72ba63f..b8f8cc1f6a 100644 --- a/src/revolution/aralt/aralt.c +++ b/src/revolution/aralt/aralt.c @@ -2,7 +2,7 @@ #include #include "sdk_math.h" -#include +#include #include "__ar.h" diff --git a/src/revolution/card/CARDUnlock.c b/src/revolution/card/CARDUnlock.c index 124e0c2069..48f64e500a 100644 --- a/src/revolution/card/CARDUnlock.c +++ b/src/revolution/card/CARDUnlock.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/dsp/dsp.c b/src/revolution/dsp/dsp.c index f7c03c9cc9..21fa18f843 100644 --- a/src/revolution/dsp/dsp.c +++ b/src/revolution/dsp/dsp.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/dsp/dsp_task.c b/src/revolution/dsp/dsp_task.c index fb1455477f..6e66ed448d 100644 --- a/src/revolution/dsp/dsp_task.c +++ b/src/revolution/dsp/dsp_task.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/dvd/dvd.c b/src/revolution/dvd/dvd.c index 13b692f260..0e5dbd0945 100644 --- a/src/revolution/dvd/dvd.c +++ b/src/revolution/dvd/dvd.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include "os/__os.h" #include "__dvd.h" diff --git a/src/revolution/dvd/dvdidutils.c b/src/revolution/dvd/dvdidutils.c index ed6c815b83..f48be89316 100644 --- a/src/revolution/dvd/dvdidutils.c +++ b/src/revolution/dvd/dvdidutils.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__dvd.h" diff --git a/src/revolution/fs/fs.c b/src/revolution/fs/fs.c index bf3af1a1da..1e5f601198 100644 --- a/src/revolution/fs/fs.c +++ b/src/revolution/fs/fs.c @@ -1,6 +1,6 @@ #include #include -#include +#include static IOSFd __fsFd = -1; static u32 __fsInitialized = FALSE; diff --git a/src/revolution/gx/GXDisplayList.c b/src/revolution/gx/GXDisplayList.c index 50d4a6d339..b16e494a8d 100644 --- a/src/revolution/gx/GXDisplayList.c +++ b/src/revolution/gx/GXDisplayList.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/gx/GXGeometry.c b/src/revolution/gx/GXGeometry.c index a7c00a4483..fd583caefa 100644 --- a/src/revolution/gx/GXGeometry.c +++ b/src/revolution/gx/GXGeometry.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/gx/GXInit.c b/src/revolution/gx/GXInit.c index 50b5d4026d..0504827170 100644 --- a/src/revolution/gx/GXInit.c +++ b/src/revolution/gx/GXInit.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/gx/GXMisc.c b/src/revolution/gx/GXMisc.c index fe757ab0f7..e80e90ac4b 100644 --- a/src/revolution/gx/GXMisc.c +++ b/src/revolution/gx/GXMisc.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/revolution/gx/GXTexture.c b/src/revolution/gx/GXTexture.c index 97abcfda02..0b3b6787f0 100644 --- a/src/revolution/gx/GXTexture.c +++ b/src/revolution/gx/GXTexture.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__gx.h" diff --git a/src/revolution/gx/GXVerifRAS.c b/src/revolution/gx/GXVerifRAS.c index 190647818e..33a16b46ab 100644 --- a/src/revolution/gx/GXVerifRAS.c +++ b/src/revolution/gx/GXVerifRAS.c @@ -1,6 +1,6 @@ #if DEBUG -#include +#include #include diff --git a/src/revolution/gx/GXVerifXF.c b/src/revolution/gx/GXVerifXF.c index ec2cde4f6d..79783ff192 100644 --- a/src/revolution/gx/GXVerifXF.c +++ b/src/revolution/gx/GXVerifXF.c @@ -1,6 +1,6 @@ #if DEBUG -#include +#include #include diff --git a/src/revolution/homebuttonLib/HBMBase.cpp b/src/revolution/homebuttonLib/HBMBase.cpp index 99beba4c99..f7666506cc 100644 --- a/src/revolution/homebuttonLib/HBMBase.cpp +++ b/src/revolution/homebuttonLib/HBMBase.cpp @@ -8,7 +8,7 @@ #include "nw4hbm/lyt/arcResourceAccessor.h" #include "nw4hbm/math/triangular.h" -#include "new.h" +#include #if HBM_REVISION == 1 #define LN(rev1, rev2) rev1 diff --git a/src/revolution/homebuttonLib/HBMBase.h b/src/revolution/homebuttonLib/HBMBase.h index 8707cb1695..55156b28c6 100644 --- a/src/revolution/homebuttonLib/HBMBase.h +++ b/src/revolution/homebuttonLib/HBMBase.h @@ -17,7 +17,7 @@ #include "nw4hbm/snd/SoundSystem.h" -#include "new.h" +#include namespace homebutton { static void initgx(); diff --git a/src/revolution/homebuttonLib/HBMGUIManager.cpp b/src/revolution/homebuttonLib/HBMGUIManager.cpp index 99ab563da6..0cb856cbdf 100644 --- a/src/revolution/homebuttonLib/HBMGUIManager.cpp +++ b/src/revolution/homebuttonLib/HBMGUIManager.cpp @@ -5,7 +5,7 @@ #include "nw4hbm/lyt/picture.h" #include "nw4hbm/lyt/window.h" -#include "new.h" +#include namespace homebutton { namespace gui { diff --git a/src/revolution/homebuttonLib/HBMRemoteSpk.cpp b/src/revolution/homebuttonLib/HBMRemoteSpk.cpp index 4d2bc75c2d..126029c381 100644 --- a/src/revolution/homebuttonLib/HBMRemoteSpk.cpp +++ b/src/revolution/homebuttonLib/HBMRemoteSpk.cpp @@ -2,7 +2,7 @@ #include "HBMController.h" -#include "string.h" +#include namespace homebutton { diff --git a/src/revolution/homebuttonLib/nw4hbm/db/assert.h b/src/revolution/homebuttonLib/nw4hbm/db/assert.h index 3e62ab08d7..8a7097e4f5 100644 --- a/src/revolution/homebuttonLib/nw4hbm/db/assert.h +++ b/src/revolution/homebuttonLib/nw4hbm/db/assert.h @@ -3,7 +3,7 @@ #include -#include +#include namespace nw4hbm { namespace db { diff --git a/src/revolution/homebuttonLib/nw4hbm/db/db_directPrint.cpp b/src/revolution/homebuttonLib/nw4hbm/db/db_directPrint.cpp index 92d5ce2aa5..a09b2df354 100644 --- a/src/revolution/homebuttonLib/nw4hbm/db/db_directPrint.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/db/db_directPrint.cpp @@ -3,7 +3,7 @@ #include "assert.h" #include "directPrint.h" -#include +#include #define ROUND_UP(x, align) (((x) + (align)-1) & (-(align))) #define ROUND_DOWN(x, align) ((x) & (~((align) - 1))) diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp index a1a86b1603..f142b9ff51 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp @@ -4,8 +4,8 @@ #include "layout.h" #include "pane.h" -#include "new.h" -#include +#include +#include namespace { // pretend this is nw4hbm::lyt diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_arcResourceAccessor.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_arcResourceAccessor.cpp index 554ba0d985..f60362fdf4 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_arcResourceAccessor.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_arcResourceAccessor.cpp @@ -2,7 +2,7 @@ #include -#include "string.h" +#include namespace { diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp index 9e26b3bdb4..a3579403df 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp @@ -2,7 +2,7 @@ #include "layout.h" -#include +#include namespace nw4hbm { namespace lyt { diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp index ab04812226..df256f4f0a 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp @@ -1,6 +1,6 @@ #include "drawInfo.h" -#include +#include namespace nw4hbm { namespace lyt { diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp index ef44a5abab..c8a0835765 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp @@ -3,8 +3,8 @@ #include "common.h" #include "layout.h" -#include -#include +#include +#include namespace nw4hbm { diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp index 1fe41d34e9..53f7566427 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp @@ -5,7 +5,7 @@ #include "textBox.h" #include "window.h" -#include +#include #define CONVERT_OFFSET_TO_PTR(type_, ptr_, offset_) \ reinterpret_cast(reinterpret_cast(ptr_) + offset_) diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_material.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_material.cpp index ac44e57e51..cbc6cd036e 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_material.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_material.cpp @@ -6,7 +6,7 @@ #include -#include +#include static const GXColorS10 DefaultBlackColor = {0, 0, 0, 0}; diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp index a56cf35c0f..cf8e2f4091 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp @@ -3,7 +3,7 @@ #include "common.h" #include "layout.h" -#include +#include namespace { // pretend this is nw4hbm::lyt diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp index 65d262e033..5d1d522523 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp @@ -2,7 +2,7 @@ #include "layout.h" -#include "new.h" +#include namespace nw4hbm { namespace lyt { diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp index 1dc5fea683..d7bb8f9050 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp @@ -8,7 +8,7 @@ #include "pane.h" #include "textBox.h" -#include "new.h" +#include namespace nw4hbm { namespace lyt { diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_window.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_window.cpp index bc909c15eb..294e5ca820 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_window.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_window.cpp @@ -2,7 +2,7 @@ #include "layout.h" -#include "new.h" +#include struct TextureFlipInfo { /* 0x00 */ u8 coords[4][2]; diff --git a/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h b/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h index 5a7485eb0a..e0ccf2445c 100644 --- a/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h +++ b/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h @@ -1,8 +1,8 @@ #ifndef NW4HBM_MATH_ARITHMETIC_H #define NW4HBM_MATH_ARITHMETIC_H -#include -#include +#include +#include #include #include diff --git a/src/revolution/homebuttonLib/nw4hbm/math/triangular.h b/src/revolution/homebuttonLib/nw4hbm/math/triangular.h index f260a5ceeb..9f175a00cc 100644 --- a/src/revolution/homebuttonLib/nw4hbm/math/triangular.h +++ b/src/revolution/homebuttonLib/nw4hbm/math/triangular.h @@ -1,8 +1,8 @@ #ifndef NW4HBM_MATH_TRIANGULAR_H #define NW4HBM_MATH_TRIANGULAR_H -#include -#include +#include +#include #include diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h b/src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h index 65ac357af8..feb0933c1b 100644 --- a/src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h +++ b/src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h @@ -4,7 +4,7 @@ #include #include #include "DisposeCallbackManager.h" -#include "climits.h" +#include #include "snd_global.h" #include "snd_types.h" diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/Channel.h b/src/revolution/homebuttonLib/nw4hbm/snd/Channel.h index 49185de63d..335d9bec1b 100644 --- a/src/revolution/homebuttonLib/nw4hbm/snd/Channel.h +++ b/src/revolution/homebuttonLib/nw4hbm/snd/Channel.h @@ -1,7 +1,7 @@ #ifndef NW4HBM_SND_CHANNEL_H #define NW4HBM_SND_CHANNEL_H -#include // USHRT_MAX +#include // USHRT_MAX #include diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/InstancePool.h b/src/revolution/homebuttonLib/nw4hbm/snd/InstancePool.h index 9a74c22f39..69054fc90d 100644 --- a/src/revolution/homebuttonLib/nw4hbm/snd/InstancePool.h +++ b/src/revolution/homebuttonLib/nw4hbm/snd/InstancePool.h @@ -1,7 +1,7 @@ #ifndef NW4HBM_SND_INSTANCE_POOL_H #define NW4HBM_SND_INSTANCE_POOL_H -#include +#include #include namespace nw4hbm { diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h b/src/revolution/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h index 5af6bb4dda..9649d6920b 100644 --- a/src/revolution/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h +++ b/src/revolution/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h @@ -1,7 +1,7 @@ #ifndef NW4HBM_SND_SOUND_INSTANCE_MANAGER_H #define NW4HBM_SND_SOUND_INSTANCE_MANAGER_H -#include +#include #include diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h b/src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h index 751d69846b..3692ff3ff5 100644 --- a/src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h +++ b/src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h @@ -6,7 +6,7 @@ #include "inlines.h" #include "../db/assert.h" -#include +#include namespace nw4hbm { namespace ut { diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h b/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h index fc21259462..e19778295c 100644 --- a/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h +++ b/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h @@ -6,8 +6,8 @@ #include "CharWriter.h" #include "Rect.h" -#include -#include +#include +#include #include "TagProcessorBase.h" diff --git a/src/revolution/homebuttonLib/sound/mix.cpp b/src/revolution/homebuttonLib/sound/mix.cpp index 36dcc452ae..2f5cfae669 100644 --- a/src/revolution/homebuttonLib/sound/mix.cpp +++ b/src/revolution/homebuttonLib/sound/mix.cpp @@ -1,7 +1,7 @@ #include "mix.h" -#include +#include #include diff --git a/src/revolution/homebuttonLib/sound/synenv.cpp b/src/revolution/homebuttonLib/sound/synenv.cpp index ec524ec197..c9057b158e 100644 --- a/src/revolution/homebuttonLib/sound/synenv.cpp +++ b/src/revolution/homebuttonLib/sound/synenv.cpp @@ -1,8 +1,8 @@ #include "synprivate.h" -#include -#include +#include +#include #include diff --git a/src/revolution/ipc/ipcProfile.c b/src/revolution/ipc/ipcProfile.c index ff963a44e5..95ffec8bb9 100644 --- a/src/revolution/ipc/ipcProfile.c +++ b/src/revolution/ipc/ipcProfile.c @@ -1,5 +1,5 @@ #include -#include +#include static u32 IpcReqPtrArray[96] = {0}; static u32 IpcReqArray[0x300] = {0}; diff --git a/src/revolution/ipc/ipcclt.c b/src/revolution/ipc/ipcclt.c index 36cd1c1ada..7484547cd2 100644 --- a/src/revolution/ipc/ipcclt.c +++ b/src/revolution/ipc/ipcclt.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include /* macro for matching __ipcQueueRequest */ #define diff(a, b) \ diff --git a/src/revolution/nand/NANDCore.c b/src/revolution/nand/NANDCore.c index 35235c0b3f..c93ec26c9c 100644 --- a/src/revolution/nand/NANDCore.c +++ b/src/revolution/nand/NANDCore.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include #ifdef SDK_AUG2010 #define BUILD_DATE "Aug 23 2010" diff --git a/src/revolution/nand/NANDLogging.c b/src/revolution/nand/NANDLogging.c index 3106fde878..8e620895d5 100644 --- a/src/revolution/nand/NANDLogging.c +++ b/src/revolution/nand/NANDLogging.c @@ -1,8 +1,8 @@ #include #include #include -#include -#include +#include +#include static IOSFd s_fd = -255; static IOSError s_err = ISFS_ERROR_UNKNOWN; diff --git a/src/revolution/nand/nand.c b/src/revolution/nand/nand.c index 8e445ca37c..6155789690 100644 --- a/src/revolution/nand/nand.c +++ b/src/revolution/nand/nand.c @@ -2,7 +2,7 @@ #include #include -#include +#include static BOOL nandInspectPermission(u8); static void nandSplitPerm(u8, u32*, u32*, u32*); diff --git a/src/revolution/os/OS.c b/src/revolution/os/OS.c index 57872a3b0e..382a56e524 100644 --- a/src/revolution/os/OS.c +++ b/src/revolution/os/OS.c @@ -9,7 +9,7 @@ #include "__os.h" #include "__dvd.h" -#include +#include #define NOP 0x60000000 diff --git a/src/revolution/os/OSAudioSystem.c b/src/revolution/os/OSAudioSystem.c index a426d869d1..18a6785186 100644 --- a/src/revolution/os/OSAudioSystem.c +++ b/src/revolution/os/OSAudioSystem.c @@ -1,7 +1,7 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSError.c b/src/revolution/os/OSError.c index 771dc4f661..7784d2b086 100644 --- a/src/revolution/os/OSError.c +++ b/src/revolution/os/OSError.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/os/OSExec.c b/src/revolution/os/OSExec.c index 35bdc46f6b..39e2edc4ef 100644 --- a/src/revolution/os/OSExec.c +++ b/src/revolution/os/OSExec.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include "__os.h" #include "__dvd.h" diff --git a/src/revolution/os/OSFatal.c b/src/revolution/os/OSFatal.c index cc395e090a..32222db082 100644 --- a/src/revolution/os/OSFatal.c +++ b/src/revolution/os/OSFatal.c @@ -4,7 +4,7 @@ #include #include "__os.h" -#include +#include typedef struct OSFatalParam { GXColor fg; diff --git a/src/revolution/os/OSInterrupt.c b/src/revolution/os/OSInterrupt.c index 939e943533..dc360f2901 100644 --- a/src/revolution/os/OSInterrupt.c +++ b/src/revolution/os/OSInterrupt.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSLaunch.c b/src/revolution/os/OSLaunch.c index 8165e04f11..2c57906e95 100644 --- a/src/revolution/os/OSLaunch.c +++ b/src/revolution/os/OSLaunch.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSLink.c b/src/revolution/os/OSLink.c index ec3bde8938..816c9d3227 100644 --- a/src/revolution/os/OSLink.c +++ b/src/revolution/os/OSLink.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSPlayTime.c b/src/revolution/os/OSPlayTime.c index 16fcb7938c..a374d68409 100644 --- a/src/revolution/os/OSPlayTime.c +++ b/src/revolution/os/OSPlayTime.c @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSReset.c b/src/revolution/os/OSReset.c index e3ac6c5c52..f0dbc50ba2 100644 --- a/src/revolution/os/OSReset.c +++ b/src/revolution/os/OSReset.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include "__os.h" #include "__dvd.h" diff --git a/src/revolution/os/OSStateFlags.c b/src/revolution/os/OSStateFlags.c index 959949fab5..723069d5a6 100644 --- a/src/revolution/os/OSStateFlags.c +++ b/src/revolution/os/OSStateFlags.c @@ -1,6 +1,6 @@ #include #include -#include +#include static OSStateFlags StateFlags ATTRIBUTE_ALIGN(32); diff --git a/src/revolution/os/OSSync.c b/src/revolution/os/OSSync.c index e21499a765..4466b94070 100644 --- a/src/revolution/os/OSSync.c +++ b/src/revolution/os/OSSync.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSTime.c b/src/revolution/os/OSTime.c index 7d7ce67fa0..08eca2ed75 100644 --- a/src/revolution/os/OSTime.c +++ b/src/revolution/os/OSTime.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/pad/Pad.c b/src/revolution/pad/Pad.c index e887b188d1..4c68a1aee4 100644 --- a/src/revolution/pad/Pad.c +++ b/src/revolution/pad/Pad.c @@ -2,7 +2,7 @@ #include #include -#include +#include #include "__si.h" diff --git a/src/revolution/sc/scapi_prdinfo.c b/src/revolution/sc/scapi_prdinfo.c index 862666d428..2c7a1400a4 100644 --- a/src/revolution/sc/scapi_prdinfo.c +++ b/src/revolution/sc/scapi_prdinfo.c @@ -1,6 +1,6 @@ #include #include -#include +#include typedef struct { s8 area; diff --git a/src/revolution/sc/scsystem.c b/src/revolution/sc/scsystem.c index 21e090c5db..74d78e6bfc 100644 --- a/src/revolution/sc/scsystem.c +++ b/src/revolution/sc/scsystem.c @@ -1,6 +1,6 @@ #include #include -#include +#include // #include #ifdef SDK_AUG2010 diff --git a/src/revolution/wenc/wenc.c b/src/revolution/wenc/wenc.c index a30c7b7c13..743811892b 100644 --- a/src/revolution/wenc/wenc.c +++ b/src/revolution/wenc/wenc.c @@ -1,5 +1,5 @@ #include -#include +#include typedef struct { s32 nXN; // size 0x04, offset 0x00 diff --git a/src/revolution/wpad/WPAD.c b/src/revolution/wpad/WPAD.c index af5cc1d99c..bdd1531617 100644 --- a/src/revolution/wpad/WPAD.c +++ b/src/revolution/wpad/WPAD.c @@ -2,7 +2,7 @@ #include #include -#include +#include #include "__wpad.h"