diff options
| author | kipcode66 <kipcode66@gmail.com> | 2026-01-12 17:48:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-13 00:48:25 +0200 |
| commit | dd03bf861fdc92109c57d58cc7436066a8a02430 (patch) | |
| tree | cd4044941bb8f661d3b5c018ed94cb18ff650cc6 /include | |
| parent | 53aaed17c0a635c8f5542c2b2aeaa65f63c734c4 (diff) | |
standard compiler compatibility changes (#3040)
* move math to cmath
* replace stdarg to cstdarg
* change stdint to stdint.h
* minor fixes
* change stdio to cstdio
* change stdlib to stdlib
* renamed ctype to cctype
* fix missing argument for UNSET_FLAG
Diffstat (limited to 'include')
27 files changed, 27 insertions, 28 deletions
diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/include/JSystem/J2DGraph/J2DPrint.h index be06e01c26..aa0ffbdcf1 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 <stdarg> +#include <cstdarg> class JUTFont; class J2DPrint; diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h index 462849c843..dcb74c1f46 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 <stdint> +#include <stdint.h> class J3DJoint; class J3DMaterialAnm; diff --git a/include/JSystem/J3DGraphBase/J3DPacket.h b/include/JSystem/J3DGraphBase/J3DPacket.h index 95ab7f18a3..374c41ebda 100644 --- a/include/JSystem/J3DGraphBase/J3DPacket.h +++ b/include/JSystem/J3DGraphBase/J3DPacket.h @@ -6,7 +6,7 @@ #include "JSystem/J3DGraphBase/J3DEnum.h" #include "dolphin/gd/GDBase.h" #include "dolphin/mtx.h" -#include <stdint> +#include <stdint.h> class J3DMatPacket; diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h index 152f552b4d..177df65a38 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 <stdint> +#include <stdint.h> /** * @ingroup jsystem-j3d diff --git a/include/JSystem/JAudio2/JAISeqDataMgr.h b/include/JSystem/JAudio2/JAISeqDataMgr.h index c207f0878c..510f1f4905 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 <stdint> +#include <stdint.h> /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JAUStreamAramMgr.h b/include/JSystem/JAudio2/JAUStreamAramMgr.h index d33306d323..bf861b495d 100644 --- a/include/JSystem/JAudio2/JAUStreamAramMgr.h +++ b/include/JSystem/JAudio2/JAUStreamAramMgr.h @@ -6,7 +6,7 @@ #include "JSystem/JAudio2/JASHeapCtrl.h" #include "JSystem/JUtility/JUTAssert.h" #include <bitset> -#include <stdint> +#include <stdint.h> /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JGadget/std-vector.h b/include/JSystem/JGadget/std-vector.h index 33cea8a0a5..74553888c9 100644 --- a/include/JSystem/JGadget/std-vector.h +++ b/include/JSystem/JGadget/std-vector.h @@ -5,7 +5,7 @@ #include "JSystem/JGadget/std-memory.h" #include <algorithm> #include <memory> -#include <stdint> +#include <stdint.h> namespace JGadget { namespace vector { diff --git a/include/JSystem/JHostIO/JORMContext.h b/include/JSystem/JHostIO/JORMContext.h index f16ffdd57d..0db8cf22a6 100644 --- a/include/JSystem/JHostIO/JORMContext.h +++ b/include/JSystem/JHostIO/JORMContext.h @@ -2,7 +2,7 @@ #define JORMCONTEXT_H #include <dolphin/dolphin.h> -#include <stdint> +#include <stdint.h> #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 f7739ada1d..1535ba757b 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 <stdint> +#include <stdint.h> /** * @ingroup jsystem-jkernel diff --git a/include/JSystem/JMath/JMATrigonometric.h b/include/JSystem/JMath/JMATrigonometric.h index 5337891e33..9e12850a76 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 <math> +#include <cmath> #include <utility> #ifdef __cplusplus diff --git a/include/JSystem/JMath/JMath.h b/include/JSystem/JMath/JMath.h index a4a463acb6..df02301499 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 <math> +#include <cmath> 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/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h index 1531bd183d..b79e6f9022 100644 --- a/include/JSystem/JParticle/JPAEmitter.h +++ b/include/JSystem/JParticle/JPAEmitter.h @@ -2,7 +2,7 @@ #define JPAEMITTER_H #include <dolphin/gx.h> -#include <stdint> +#include <stdint.h> #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 f2f51ae923..3684a66da2 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 <math> +#include <cmath> #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 f5a41031f5..27df37a634 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 <math> +#include <cmath> #define m_PI_D 3.141592653589793 diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h index 653ffc9474..10315471b4 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-object.h +++ b/include/JSystem/JStudio/JStudio/jstudio-object.h @@ -4,7 +4,7 @@ #include "JSystem/JStudio/JStudio/jstudio-control.h" #include "global.h" #include <limits> -#include <math> +#include <cmath> typedef struct _GXColor GXColor; diff --git a/include/JSystem/JSupport/JSupport.h b/include/JSystem/JSupport/JSupport.h index bdd2960543..717fd9b7b0 100644 --- a/include/JSystem/JSupport/JSupport.h +++ b/include/JSystem/JSupport/JSupport.h @@ -2,7 +2,7 @@ #define JSUPPORT_H #include <dolphin/dolphin.h> -#include <stdint> +#include <stdint.h> /** * @ingroup jsystem-jsupport diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h index e1708adab9..f8d26f8f3c 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 <stdarg> +#include <cstdarg> /** * @ingroup jsystem-jutility diff --git a/include/JSystem/JUtility/JUTDirectPrint.h b/include/JSystem/JUtility/JUTDirectPrint.h index aeff790f55..14ed2c28b8 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 <stdarg> +#include <cstdarg> /** * @ingroup jsystem-jutility diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h index 4830ed4f74..522551dd63 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 <stdarg> +#include <cstdarg> #include <dolphin/gx.h> #include <dolphin/os.h> #include "global.h" diff --git a/include/JSystem/JUtility/JUTTexture.h b/include/JSystem/JUtility/JUTTexture.h index 8294cb994a..b5965eb185 100644 --- a/include/JSystem/JUtility/JUTTexture.h +++ b/include/JSystem/JUtility/JUTTexture.h @@ -2,7 +2,7 @@ #define JUTTEXTURE_H #include <dolphin/gx.h> -#include <stdint> +#include <stdint.h> class JUTPalette; diff --git a/include/SSystem/SComponent/c_m3d.h b/include/SSystem/SComponent/c_m3d.h index a8045c74a7..1db37b44a8 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 <math> +#include <cmath> #include "dolphin/mtx.h" class cM3dGAab; diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index 838949cb13..23b059be98 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 <math> +#include <cmath> 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 8f00781e8c..4ce26227b3 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 <math> +#include <cmath> /** * @ingroup actors-objects diff --git a/include/d/d_menu_dmap_map.h b/include/d/d_menu_dmap_map.h index 311448c72b..f1a5432391 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 <math> +#include <cmath> class dMenu_DmapMap_c { public: diff --git a/include/d/dolzel_base.pch b/include/d/dolzel_base.pch index eb6533d44e..ac3dbb96d3 100644 --- a/include/d/dolzel_base.pch +++ b/include/d/dolzel_base.pch @@ -10,7 +10,7 @@ #include "Z2AudioLib/Z2Calc.h" // IWYU pragma: export // Fixes weak function/RTTI ordering -#include <math> // IWYU pragma: export +#include <cmath> // IWYU pragma: export #include <cstring> // IWYU pragma: export #include "Z2AudioLib/Z2AudioArcLoader.h" // IWYU pragma: export #include "JSystem/JAudio2/JAUStreamAramMgr.h" // IWYU pragma: export diff --git a/include/revolution/dvd.h b/include/revolution/dvd.h index 31f6c1badf..967390d498 100644 --- a/include/revolution/dvd.h +++ b/include/revolution/dvd.h @@ -3,6 +3,7 @@ #include <revolution/types.h> #include <revolution/esp.h> +#include "global.h" #ifdef __cplusplus extern "C" { @@ -185,8 +186,6 @@ typedef struct DVDGameTOC { DVDPartitionInfo* partitionInfos; } DVDGameTOC; -#define ROUND(n, a) (((u32)(n) + (a)-1) & ~((a)-1)) - typedef struct DVDPartitionParams DVDPartitionParams; struct DVDPartitionParams { diff --git a/include/revolution/wpad/bte.h b/include/revolution/wpad/bte.h index c816fa8baf..1751d8998b 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 <stdint> +#include <stdint.h> // taken from https://github.com/doldecomp/sdk_2009-12-11/blob/main/include/context_bte.h |
