diff options
| author | Trueffeloot <geiloking135@gmail.com> | 2023-04-25 18:33:26 +0200 |
|---|---|---|
| committer | Trueffeloot <geiloking135@gmail.com> | 2023-04-25 18:33:26 +0200 |
| commit | fd6e75ee714fe577ca1d0c14ddfa8c71b45ee753 (patch) | |
| tree | 663de597a574a46ad1e46a6776cb432b5ae5949a /libs/JSystem/J2DGraph | |
| parent | 1c5bacc97bc11bc9694410f84c5ea44d3b1f3b35 (diff) | |
| parent | af265612c1e714a3f135c23f426b72952926fc40 (diff) | |
Merge remote-tracking branch 'upstream/master' into work7
Diffstat (limited to 'libs/JSystem/J2DGraph')
| -rw-r--r-- | libs/JSystem/J2DGraph/J2DManage.cpp | 2 | ||||
| -rw-r--r-- | libs/JSystem/J2DGraph/J2DPrint.cpp | 3 | ||||
| -rw-r--r-- | libs/JSystem/J2DGraph/J2DTextBox.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/libs/JSystem/J2DGraph/J2DManage.cpp b/libs/JSystem/J2DGraph/J2DManage.cpp index bf7f07717a..60318ed15c 100644 --- a/libs/JSystem/J2DGraph/J2DManage.cpp +++ b/libs/JSystem/J2DGraph/J2DManage.cpp @@ -4,7 +4,7 @@ // #include "JSystem/J2DGraph/J2DManage.h" -#include "MSL_C/MSL_Common/Src/string.h" +#include "MSL_C/string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/J2DGraph/J2DPrint.cpp b/libs/JSystem/J2DGraph/J2DPrint.cpp index 6dcde38036..dea6720967 100644 --- a/libs/JSystem/J2DGraph/J2DPrint.cpp +++ b/libs/JSystem/J2DGraph/J2DPrint.cpp @@ -5,6 +5,7 @@ #include "JSystem/J2DGraph/J2DPrint.h" #include "MSL_C/stdio.h" +#include "MSL_C/stdlib.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -49,8 +50,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strtol(); -extern "C" void strtoul(); extern "C" u8 sSystemHeap__7JKRHeap[4]; // diff --git a/libs/JSystem/J2DGraph/J2DTextBox.cpp b/libs/JSystem/J2DGraph/J2DTextBox.cpp index edc385fbd1..10fdc19796 100644 --- a/libs/JSystem/J2DGraph/J2DTextBox.cpp +++ b/libs/JSystem/J2DGraph/J2DTextBox.cpp @@ -5,7 +5,7 @@ #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/J2DGraph/J2DPrint.h" -#include "MSL_C/MSL_Common/Src/string.h" +#include "MSL_C/string.h" #include "dol2asm.h" #include "dolphin/types.h" |