Re-import MSL_C from TP

include/JSystem/JGeometry.h

@@ -2,9 +2,10 @@
 #define JGEOMETRY_H
 
 #include "common.h"
-#include "math.h"
 #include "JSystem/JMath/JMath.h"
 
+#include <cmath>
+
 // TODO - a lot of this has been moved to nw4r and egg. Kept for reference for now.
 
 namespace JGeometry {

include/JSystem/JMath/JMath.h

@@ -3,7 +3,7 @@
 
 #include "common.h"
 #include "rvl/MTX.h"
-#include "math.h"
+#include <cmath>
 
 void JMAMTXApplyScale(const Mtx, Mtx, f32, f32, f32);
 void JMAEulerToQuat(s16 param_0, s16 param_1, s16 param_2, Quaternion* param_3);

include/JSystem/JParticle/JPAEmitter.h

@@ -12,6 +12,8 @@
 #include "egg/math/eggVector.h"
 #include "m/m_angle.h"
 
+#include <cstdint>
+
 class JPAResourceManager;
 class JPABaseEmitter;
 class JPAEmitterManager;

include/c/c_math.h

@@ -4,7 +4,7 @@
 #include "common.h"
 #include "egg/math/eggMath.h"
 
-#include <cmath.h>
+#include <cmath>
 
 namespace cM {
 s16 atan2s(f32, f32);

include/common.h

@@ -108,8 +108,6 @@
 #define DECOMP_DONT_INLINE __attribute__((never_inline))
 #endif
 
-#include "stddef.h"
-
 typedef signed char s8;
 typedef signed short s16;
 typedef signed long s32;
@@ -174,8 +172,7 @@ private:
 };
 #endif
 
-#define INT32_MAX (0x7fffffff)
-#define UINT32_MAX (0xffffffff)
+#define MSL_INLINE inline
 
 #define FLOAT_MIN (1.175494351e-38f)
 #define FLOAT_MAX (3.40282346638528860e+38f)

include/d/col/c/c_m3d.h

@@ -2,11 +2,12 @@
 #define C_M3D_H
 
 #include "common.h"
-#include "math.h"
 #include "nw4r/types_nw4r.h"
 
 #include "nw4r/math.h" // IWYU pragma: export
 
+#include <cmath>
+
 class cM3dGAab;
 class cM3dGCps;
 class cM3dGCyl;

include/egg/math/eggMath.h

@@ -2,7 +2,6 @@
 #define EGG_MATH_H
 
 #include "common.h"
-#include "math.h"
 
 namespace EGG {
 

include/egg/prim/eggAssert.h

@@ -1,8 +1,8 @@
 #ifndef EGG_ASSERT_H
 #define EGG_ASSERT_H
 
-#include "__va_arg.h"
 #include "common.h"
+#include <cstdarg>
 
 namespace EGG {
 // All this is guess

include/egg/prim/eggBinary.h

@@ -3,6 +3,8 @@
 
 #include "common.h"
 
+#include <cstddef>
+
 namespace EGG {
 
 /**

include/libms/libms.h

@@ -3,6 +3,8 @@
 
 #include "common.h"
 
+#include <stddef.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

include/libms/msgfile.h

@@ -2,7 +2,7 @@
 #define LIBMS_MSGFILE_H
 
 #include "common.h"
-#include <wchar.h>
+#include <cstddef>
 
 #ifdef __cplusplus
 extern "C" {

include/m/m_angle.h

@@ -4,10 +4,11 @@
 #include "c/c_math.h"
 #include "common.h"
 #include "m/m_vec.h"
-#include "math.h"
 #include "nw4r/math/math_triangular.h"
 #include "s/s_Math.h"
 
+#include <cmath>
+
 class mAng {
 public:
     mAng() {}

include/nw4r/db/db_directPrint.h

@@ -1,11 +1,12 @@
 #ifndef NW4R_DB_DIRECT_PRINT_H
 #define NW4R_DB_DIRECT_PRINT_H
 
-#include "__va_arg.h"
 #include "common.h"
 
 #include "rvl/GX.h" // IWYU pragma: export
 
+#include <cstdarg>
+
 namespace nw4r {
 
 namespace db {

include/nw4r/math/math_arithmetic.h

@@ -1,7 +1,6 @@
 #ifndef NW4R_MATH_ARITHMETIC_H
 #define NW4R_MATH_ARITHMETIC_H
 
-#include "math.h"
 #include "nw4r/types_nw4r.h" // IWYU pragma: export
 #include "rvl/OS.h"          // IWYU pragma: export
 
@@ -32,7 +31,7 @@ inline f32 FAbs(register f32 x) {
 }
 
 inline f32 FCeil(f32 x) {
-    return std::ceilf(x);
+    return std::ceil(x);
 }
 
 inline f32 FExp(f32 x) {
@@ -40,7 +39,7 @@ inline f32 FExp(f32 x) {
 }
 
 inline f32 FFloor(f32 x) {
-    return std::floorf(x);
+    return std::floor(x);
 }
 
 inline f32 FInv(register f32 x) {

include/nw4r/math/math_triangular.h

@@ -1,6 +1,6 @@
 #ifndef NW4R_MATH_TRIANGULAR_H
 #define NW4R_MATH_TRIANGULAR_H
-#include "math.h"
+#include <cmath>
 #include "nw4r/math/math_arithmetic.h"
 #include "nw4r/types_nw4r.h"
 

include/rvl/AXFX/AXFXHooks.h

@@ -1,6 +1,9 @@
 #ifndef RVL_SDK_AXFX_HOOKS_H
 #define RVL_SDK_AXFX_HOOKS_H
 #include "common.h"
+
+#include <stddef.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

include/rvl/OS/OSArena.h

@@ -1,6 +1,8 @@
 #ifndef RVL_SDK_OS_ARENA_H
 #define RVL_SDK_OS_ARENA_H
 #include "common.h"
+
+#include <stddef.h>
 #ifdef __cplusplus
 extern "C" {
 #endif

include/rvl/OS/OSError.h

@@ -1,8 +1,8 @@
 #ifndef RVL_SDK_OS_ERROR_H
 #define RVL_SDK_OS_ERROR_H
 
-#include "__va_arg.h"
 #include "common.h"
+#include <stdarg.h>
 
 #include "rvl/OS/OSContext.h"
 

include/rvl/OS/OSUtf.h

@@ -2,7 +2,7 @@
 #define RVL_SDK_OS_UTF_H
 
 #include "common.h"
-#include "wchar.h"
+#include "stddef.h"
 
 #ifdef __cplusplus
 extern "C" {

include/rvl/OS/__ppc_eabi_init.h

@@ -12,7 +12,7 @@ DECL_SECTION(".init") void __flush_cache(void *, size_t);
 void __init_user(void);
 void __init_cpp(void);
 void __fini_cpp(void);
-DECL_WEAK void exit(void);
+DECL_WEAK void exit(int status);
 void _ExitProcess(void);
 
 /**

include/sized_string.h

@@ -1,11 +1,11 @@
 #ifndef SIZED_STRING_H
 #define SIZED_STRING_H
 
-#include "__va_arg.h"
 #include "common.h"
-#include "string.h"
-#include "wstring.h"
-#include "printf.h"
+#include <stdarg.h>
+#include <string.h>
+#include <stddef.h>
+#include <printf.h>
 
 extern "C" bool strequals(const char *a, const char *b);