add MSL_C/stdio.h (#317)

20 files changed, 24 insertions, 8 deletions

diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp
index 49ee373ac3..0ce1ce732b 100644
--- a/src/DynamicLink.cpp
+++ b/src/DynamicLink.cpp
@@ -6,7 +6,7 @@
 #include "DynamicLink.h"
 #include "JSystem/JKernel/JKRDvdRipper.h"
 #include "JSystem/JUtility/JUTConsole.h"
-#include "MSL_C/MSL_Common/Src/printf.h"
+#include "MSL_C/stdio.h"
 #include "dol2asm.h"
 #include "dolphin/os/OS.h"
 #include "dolphin/types.h"
diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp
index dfe644d481..aaf065545a 100644
--- a/src/d/com/d_com_inf_game.cpp
+++ b/src/d/com/d_com_inf_game.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/com/d_com_inf_game.h"
+#include "MSL_C/stdio.h"
 #include "d/d_item.h"
 #include "d/d_procname.h"
 #include "d/d_timer.h"
diff --git a/src/d/com/d_com_static.cpp b/src/d/com/d_com_static.cpp
index a97555c059..afa3571b5b 100644
--- a/src/d/com/d_com_static.cpp
+++ b/src/d/com/d_com_static.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/com/d_com_static.h"
+#include "MSL_C/stdio.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_demo.h"
 #include "dol2asm.h"
diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp
index 7ed8aed09a..69b1acbee4 100644
--- a/src/d/d_name.cpp
+++ b/src/d/d_name.cpp
@@ -5,6 +5,7 @@
 
 #include "d/d_name.h"
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
+#include "MSL_C/stdio.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 #include "f_op/f_op_msg_mng.h"
diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp
index 4476c87e11..59e5e98dcd 100644
--- a/src/d/d_resorce.cpp
+++ b/src/d/d_resorce.cpp
@@ -13,6 +13,7 @@
 #include "JSystem/J3DGraphLoader/J3DModelLoader.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "MSL_C/MSL_Common/Src/extras.h"
+#include "MSL_C/stdio.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
 #include "dolphin/mtx/mtx.h"
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index 8d4dab58e9..77e074e3cb 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -5,6 +5,7 @@
 
 #include "d/d_stage.h"
 #include "JSystem/JKernel/JKRAramArchive.h"
+#include "MSL_C/stdio.h"
 #include "SSystem/SComponent/c_malloc.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/com/d_com_static.h"
diff --git a/src/d/event/d_event_manager.cpp b/src/d/event/d_event_manager.cpp
index 2127d52404..5764650480 100644
--- a/src/d/event/d_event_manager.cpp
+++ b/src/d/event/d_event_manager.cpp
@@ -5,6 +5,7 @@
 
 #include "d/event/d_event_manager.h"
 #include "SSystem/SComponent/c_math.h"
+#include "MSL_C/stdio.h"
 #include "Z2AudioLib/Z2AudioMgr.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_camera.h"
diff --git a/src/d/file/d_file_sel_info.cpp b/src/d/file/d_file_sel_info.cpp
index d563d8d769..c8a834516f 100644
--- a/src/d/file/d_file_sel_info.cpp
+++ b/src/d/file/d_file_sel_info.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/file/d_file_sel_info.h"
+#include "MSL_C/stdio.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/menu/d_menu_save.cpp b/src/d/menu/d_menu_save.cpp
index e673b7a13e..d3a970f09d 100644
--- a/src/d/menu/d_menu_save.cpp
+++ b/src/d/menu/d_menu_save.cpp
@@ -5,6 +5,7 @@
 
 #include "d/menu/d_menu_save.h"
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
+#include "MSL_C/stdio.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/file/d_file_sel_info.h"
 #include "d/file/d_file_sel_warning.h"
diff --git a/src/d/msg/d_msg_class.cpp b/src/d/msg/d_msg_class.cpp
index e1d4cff6cb..cbd403363b 100644
--- a/src/d/msg/d_msg_class.cpp
+++ b/src/d/msg/d_msg_class.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/msg/d_msg_class.h"
+#include "MSL_C/stdio.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/msg/d_msg_object.h"
 #include "d/msg/d_msg_unit.h"
diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp
index aa170fde24..6d50d3ae35 100644
--- a/src/d/msg/d_msg_object.cpp
+++ b/src/d/msg/d_msg_object.cpp
@@ -6,6 +6,7 @@
 #include "d/msg/d_msg_object.h"
 #include "d/msg/d_msg_out_font.h"
 #include "JSystem/JGadget/binary.h"
+#include "MSL_C/stdio.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/msg/d_msg_unit.cpp b/src/d/msg/d_msg_unit.cpp
index bdf5169a5f..bea422bea4 100644
--- a/src/d/msg/d_msg_unit.cpp
+++ b/src/d/msg/d_msg_unit.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/msg/d_msg_unit.h"
+#include "MSL_C/stdio.h"
 #include "dol2asm.h"
 #include "d/kankyo/d_kankyo.h"
 #include "d/meter/d_meter2_info.h"
diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp
index a743aa3910..349f823e04 100644
--- a/src/d/particle/d_particle.cpp
+++ b/src/d/particle/d_particle.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/particle/d_particle.h"
+#include "MSL_C/stdio.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
diff --git a/src/d/s/d_s_room.cpp b/src/d/s/d_s_room.cpp
index 123607dee6..a0c978719b 100644
--- a/src/d/s/d_s_room.cpp
+++ b/src/d/s/d_s_room.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/s/d_s_room.h"
+#include "MSL_C/stdio.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "d/s/d_s_play.h"
diff --git a/src/d/save/d_save.cpp b/src/d/save/d_save.cpp
index 23daffdd8c..d4dc037a85 100644
--- a/src/d/save/d_save.cpp
+++ b/src/d/save/d_save.cpp
@@ -5,6 +5,7 @@
 
 #include "d/save/d_save.h"
 #include "d/save/d_save_init.h"
+#include "MSL_C/stdio.h"
 #include "Z2AudioLib/Z2AudioMgr.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/meter/d_meter2_info.h"
diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp
index 4e1bedc7db..3dbd01c42b 100644
--- a/src/m_Do/m_Do_MemCardRWmng.cpp
+++ b/src/m_Do/m_Do_MemCardRWmng.cpp
@@ -4,8 +4,7 @@
  */
 
 #include "m_Do/m_Do_MemCardRWmng.h"
-#include "MSL_C/MSL_Common/Src/printf.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/stdio.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index 598019f247..70f01ca0f1 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -10,6 +10,7 @@
 #include "JSystem/JKernel/JKRAssertHeap.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JMath/JMath.h"
+#include "MSL_C/stdio.h"
 #include "MSL_C/string.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "SSystem/SComponent/c_lib.h"
diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp
index 4b61d7155d..ce5b2b8ea8 100644
--- a/src/m_Do/m_Do_printf.cpp
+++ b/src/m_Do/m_Do_printf.cpp
@@ -4,13 +4,13 @@
  */
 
 #include "m_Do/m_Do_printf.h"
+#include "MSL_C/stdio.h"
 #include "Runtime.PPCEABI.H/__va_arg.h"
 #include "dol2asm.h"
 #include "dolphin/os/OS.h"
 #include "dolphin/types.h"
 #include "m_Do/m_Do_ext.h"
 #include "dolphin/base/PPCArch.h"
-#include "MSL_C/MSL_Common/Src/file_io.h"
 
 /* 80450B98-80450B9C -00001 0004+00 0/0 6/6 0/0 .sbss            None */
 u8 __OSReport_disable;
@@ -37,7 +37,7 @@ asm void OSSwitchFiberEx(u32 param_0, u32 param_1, u32 param_2, u32 param_3, u32
 
 /* 800067C8-800067F4 001108 002C+00 3/3 0/0 0/0 .text            my_PutString__FPCc */
 void my_PutString(const char* string) {
-    fputs(string, &__files.stdout);
+    fputs(string, stdout);
 }
 
 /* 800067F4-80006814 001134 0020+00 3/3 0/0 0/0 .text OSVAttention__FPCcP16__va_list_struct */
@@ -178,7 +178,7 @@ void OSReport_FatalError(char* fmt, ...) {
     OSVAttention(fmt, args);
     my_PutString("***** FATAL ERROR *****\n\x1B[m");
     OSReportForceEnableOff();
-    fflush(&__files.stdout);
+    fflush(stdout);
     print_errors++;
 
     va_end(args);
@@ -195,7 +195,7 @@ void OSReport_Error(char* fmt, ...) {
         OSVReport(fmt, args);
         my_PutString("\x1B[m");
         OSReportForceEnableOff();
-        fflush(&__files.stdout);
+        fflush(stdout);
         va_end(args);
     }
 }
@@ -211,7 +211,7 @@ void OSReport_Warning(char* fmt, ...) {
         OSVAttention(fmt, args);
         my_PutString("\x1B[m");
         OSReportForceEnableOff();
-        fflush(&__files.stdout);
+        fflush(stdout);
         va_end(args);
     }
 }
diff --git a/src/msg/scrn/d_msg_scrn_explain.cpp b/src/msg/scrn/d_msg_scrn_explain.cpp
index 0a2981c7d0..5da4c77dbb 100644
--- a/src/msg/scrn/d_msg_scrn_explain.cpp
+++ b/src/msg/scrn/d_msg_scrn_explain.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "msg/scrn/d_msg_scrn_explain.h"
+#include "MSL_C/stdio.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/msg/scrn/d_msg_scrn_light.cpp b/src/msg/scrn/d_msg_scrn_light.cpp
index ea30a183f9..2ab1949324 100644
--- a/src/msg/scrn/d_msg_scrn_light.cpp
+++ b/src/msg/scrn/d_msg_scrn_light.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "msg/scrn/d_msg_scrn_light.h"
+#include "MSL_C/stdio.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"