From 6f322741bcdeb26efa62073f9bd5d9843229a65e Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Tue, 26 Dec 2023 23:04:28 -0800 Subject: [PATCH 1/2] should include stdio.h for sprintf, not printf.h --- src/JSystem/JAudio/JAIBasic.cpp | 1 + src/JSystem/JAudio/JAIInitData.cpp | 1 + src/d/actor/d_a_bg.cpp | 2 +- src/d/d_place_name.cpp | 2 +- src/d/d_s_logo.cpp | 2 +- src/d/d_s_room.cpp | 3 +-- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/JSystem/JAudio/JAIBasic.cpp b/src/JSystem/JAudio/JAIBasic.cpp index e9e35e348..66685241c 100644 --- a/src/JSystem/JAudio/JAIBasic.cpp +++ b/src/JSystem/JAudio/JAIBasic.cpp @@ -13,6 +13,7 @@ #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "JSystem/JUtility/JUTAssert.h" +#include "stdio.h" #include "string.h" namespace JAIInitData = JAInter::InitData; diff --git a/src/JSystem/JAudio/JAIInitData.cpp b/src/JSystem/JAudio/JAIInitData.cpp index 445348205..944ae28ae 100644 --- a/src/JSystem/JAudio/JAIInitData.cpp +++ b/src/JSystem/JAudio/JAIInitData.cpp @@ -13,6 +13,7 @@ #include "JSystem/JAudio/JASSystemHeap.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "JSystem/JUtility/JUTAssert.h" +#include "stdio.h" #include "string.h" u32* JAInter::InitData::aafPointer; diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 26bb12426..9df6552a2 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -20,7 +20,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "JSystem/JUtility/JUTAssert.h" -#include "printf.h" +#include "stdio.h" /* 800D8434-800D8478 .text setArcName__6daBg_cFv */ const char* daBg_c::setArcName() { diff --git a/src/d/d_place_name.cpp b/src/d/d_place_name.cpp index 5c63a2d7e..84d3a6b90 100644 --- a/src/d/d_place_name.cpp +++ b/src/d/d_place_name.cpp @@ -17,7 +17,7 @@ #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/J2DGraph/J2DPane.h" #include "JSystem/J2DGraph/J2DScreen.h" -#include "printf.h" +#include "stdio.h" enum { dPn_stage_max_e = 19 }; diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index 4aa0588f3..fe6111519 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -25,7 +25,7 @@ #include "dolphin/vi/vi.h" #include "dolphin/os/OS.h" #include "string.h" -#include "printf.h" +#include "stdio.h" class dScnLogo_c : public scene_class { public: diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 78af9a8a5..2922a6fda 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -19,8 +19,7 @@ #include "m_Do/m_Do_dvd_thread.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JKernel/JKRExpHeap.h" -#include "string.h" -#include "printf.h" +#include "stdio.h" class room_of_scene_class : public scene_class { public: From 7d26a34825a8230aac821b3ab891b389684bbdd4 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Fri, 29 Dec 2023 20:52:07 -0800 Subject: [PATCH 2/2] stdarg.h --- include/JSystem/JUtility/JUTConsole.h | 3 +-- include/JSystem/JUtility/JUTDirectPrint.h | 2 +- include/JSystem/JUtility/JUTException.h | 3 +-- include/dolphin/os/OS.h | 2 +- include/m_Do/m_Do_printf.h | 2 +- src/JSystem/JUtility/JUTDbPrint.cpp | 3 +-- .../MSL/MSL_C/MSL_Common/Include/stdarg.h | 6 ++++++ 7 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg.h diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h index 380235731..bc51fcd5b 100644 --- a/include/JSystem/JUtility/JUTConsole.h +++ b/include/JSystem/JUtility/JUTConsole.h @@ -4,8 +4,7 @@ #include "JSystem/JGadget/linklist.h" #include "JSystem/JKernel/JKRDisposer.h" #include "JSystem/JUtility/JUTFont.h" -#include "__va_arg.h" -#include "dolphin/types.h" +#include "stdarg.h" class JUTConsole : public JKRDisposer { public: diff --git a/include/JSystem/JUtility/JUTDirectPrint.h b/include/JSystem/JUtility/JUTDirectPrint.h index d55010456..0e77c6489 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 "__va_arg.h" +#include "stdarg.h" namespace std { diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h index 2bf1ae899..3fea4e3af 100644 --- a/include/JSystem/JUtility/JUTException.h +++ b/include/JSystem/JUtility/JUTException.h @@ -3,10 +3,9 @@ #include "JSystem/JKernel/JKRThread.h" #include "JSystem/JUtility/JUTGamePad.h" -#include "__va_arg.h" +#include "stdarg.h" #include "dolphin/gx/GXEnum.h" #include "dolphin/os/OSError.h" -#include "dolphin/types.h" #include "global.h" typedef struct _GXRenderModeObj GXRenderModeObj; diff --git a/include/dolphin/os/OS.h b/include/dolphin/os/OS.h index 247a41741..5ae1b455c 100644 --- a/include/dolphin/os/OS.h +++ b/include/dolphin/os/OS.h @@ -1,7 +1,7 @@ #ifndef OS_H_ #define OS_H_ -#include "__va_arg.h" +#include "stdarg.h" #include "dolphin/dvd/dvd.h" #include "dolphin/os/OSAlarm.h" diff --git a/include/m_Do/m_Do_printf.h b/include/m_Do/m_Do_printf.h index a3f6b3a80..40587e282 100644 --- a/include/m_Do/m_Do_printf.h +++ b/include/m_Do/m_Do_printf.h @@ -1,7 +1,7 @@ #ifndef M_DO_M_DO_PRINTF_H #define M_DO_M_DO_PRINTF_H -#include "__va_arg.h" +#include "stdarg.h" #include "m_Do/m_Do_main.h" extern "C" { diff --git a/src/JSystem/JUtility/JUTDbPrint.cpp b/src/JSystem/JUtility/JUTDbPrint.cpp index a39373d67..37a6a7087 100644 --- a/src/JSystem/JUtility/JUTDbPrint.cpp +++ b/src/JSystem/JUtility/JUTDbPrint.cpp @@ -8,8 +8,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTVideo.h" #include "stdio.h" -#include "__va_arg.h" -#include "dolphin/types.h" +#include "stdarg.h" /* 802C328C-802C32D4 .text __ct__10JUTDbPrintFP7JUTFontP7JKRHeap */ JUTDbPrint::JUTDbPrint(JUTFont* pFont, JKRHeap* pHeap) { 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.h new file mode 100644 index 000000000..22dfc1349 --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg.h @@ -0,0 +1,6 @@ +#ifndef _MSL_COMMON_STDARG_H +#define _MSL_COMMON_STDARG_H + +#include "__va_arg.h" + +#endif /* _MSL_COMMON_STDARG_H */