Merge remote-tracking branch 'upstream/master' into work7

8 files changed, 22 insertions, 27 deletions

diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
index a9835b5858..5fe848fe8a 100644
--- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h
+++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
@@ -394,7 +394,7 @@ private:
     /* 0x54 */ int field_0x54;
     /* 0x58 */ int field_0x58;
     /* 0x5C */ u8 field_0x5c[4];
-    /* 0x60 */ u16 field_0x60[2];
+    /* 0x60 */ u16* field_0x60;
     /* 0x64 */ JUTNameTab field_0x64;
     /* 0x74 */ u8 field_0x74[4];
     /* 0x78 */ u32 mTexMtxCalcType;
@@ -415,7 +415,7 @@ private:
     /* 0x10 */ void* mAnmTable;
     /* 0x14 */ u16 field_0x14;
     /* 0x16 */ u16 mUpdateMaterialNum;
-    /* 0x18 */ void* field_0x18;
+    /* 0x18 */ u16* field_0x18;
     /* 0x1C */ JUTNameTab field_0x1c;
 };  // Size: 0x2C
 
@@ -448,9 +448,9 @@ private:
     /* 0x1C */ u16 field_0x1c;
     /* 0x1E */ u16 field_0x1e;
     /* 0x20 */ u16* mCRegUpdateMaterialID;
-    /* 0x24 */ u8 field_0x24[0x34 - 0x24];
+    /* 0x24 */ JUTNameTab field_0x24;
     /* 0x34 */ u16* mKRegUpdateMaterialID;
-    /* 0x38 */ u8 field_0x38[0x48 - 0x38];
+    /* 0x38 */ JUTNameTab field_0x38;
     /* 0x48 */ void* field_0x48;
     /* 0x4C */ void* field_0x4c;
     /* 0x50 */ int field_0x50;
diff --git a/include/JSystem/JAudio2/JASWaveArcLoader.h b/include/JSystem/JAudio2/JASWaveArcLoader.h
index 2d7e55e0aa..95fb0280b0 100644
--- a/include/JSystem/JAudio2/JASWaveArcLoader.h
+++ b/include/JSystem/JAudio2/JASWaveArcLoader.h
@@ -5,7 +5,6 @@
 #include "dolphin/types.h"
 #include "global.h"
 
-#include "MSL_C/MSL_Common/Src/string.h"
 #include "dolphin/os/OSMutex.h"
 
 #include "JSystem/JAudio2/JASDvdThread.h"
diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h
index d1d88b1417..4cb04da538 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 "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dolphin/gx/GX.h"
 #include "dolphin/types.h"
 
diff --git a/include/MSL_C/MSL_Common/Src/wchar_io.h b/include/MSL_C/MSL_Common/Src/wchar_io.h
index d42110c016..be6fb63783 100644
--- a/include/MSL_C/MSL_Common/Src/wchar_io.h
+++ b/include/MSL_C/MSL_Common/Src/wchar_io.h
@@ -3,7 +3,9 @@
 
 #include "MSL_C/MSL_Common/Src/ansi_files.h"
 
+#ifndef __cplusplus
 typedef unsigned short wchar_t;
+#endif
 
 int fwide(FILE* file, int mode);
 
diff --git a/include/MSL_C/stdlib.h b/include/MSL_C/stdlib.h
new file mode 100644
index 0000000000..0a0532aa40
--- /dev/null
+++ b/include/MSL_C/stdlib.h
@@ -0,0 +1,10 @@
+#ifndef MSL_STDLIB_H_
+#define MSL_STDLIB_H_
+
+#include "MSL_C/MSL_Common/Src/abort_exit.h"
+#include "MSL_C/MSL_Common/Src/alloc.h"
+#include "MSL_C/MSL_Common/Src/arith.h"
+#include "MSL_C/MSL_Common/Src/mbstring.h"
+#include "MSL_C/MSL_Common/Src/strtoul.h"
+
+#endif
diff --git a/include/MSL_C/string.h b/include/MSL_C/string.h
index 21cb9c7274..ea08c98fa4 100644
--- a/include/MSL_C/string.h
+++ b/include/MSL_C/string.h
@@ -1,23 +1,8 @@
 #ifndef MSL_STRING_H_
 #define MSL_STRING_H_
 
-#include "MSL_C/MSL_Common/Src/stddef.h"
+#include "MSL_C/MSL_Common/Src/extras.h"
+#include "MSL_C/MSL_Common/Src/mem.h"
+#include "MSL_C/MSL_Common/Src/string.h"
 
-
-// TODO: move to MSL_C/
-extern "C" {
-void memcpy(void*, const void*, size_t);
-void* memset(void* dest, int ch, size_t count);
-char* strrchr(const char* s, int c);
-char* strchr(const char* s, int c);
-int strncmp(const char* s1, const char* s2, size_t n);
-int strcmp(const char* s1, const char* s2);
-int stricmp(const char*, const char*);
-char* strcat(char* dest, const char* source);
-char* strncpy(char* dest, const char* source, size_t n);
-char* strcpy(char* dest, const char* source);
-size_t strlen(const char* s);
-int tolower(int);
-}
-
-#endif
\ No newline at end of file
+#endif
diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h
index 46d8d8dc28..8acbe2582c 100644
--- a/include/d/save/d_save.h
+++ b/include/d/save/d_save.h
@@ -1,7 +1,7 @@
 #ifndef D_SAVE_D_SAVE_H
 #define D_SAVE_D_SAVE_H
 
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/os/OS.h"
 #include "dolphin/types.h"
diff --git a/include/init.h b/include/init.h
index b0937bf24b..12079a2282 100644
--- a/include/init.h
+++ b/include/init.h
@@ -1,7 +1,6 @@
 #ifndef INIT_H
 #define INIT_H
 
-#include "MSL_C/MSL_Common/Src/string.h"
 #include "dolphin/types.h"
 
 #ifdef __cplusplus