summaryrefslogtreecommitdiff
path: root/src/code/system_malloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/code/system_malloc.c')
-rw-r--r--src/code/system_malloc.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/code/system_malloc.c b/src/code/system_malloc.c
index 8385a883c..de6a56b30 100644
--- a/src/code/system_malloc.c
+++ b/src/code/system_malloc.c
@@ -1,4 +1,5 @@
#include "global.h"
+#include "osMalloc.h"
#define LOG_SEVERITY_NOLOG 0
#define LOG_SEVERITY_ERROR 2
@@ -6,16 +7,6 @@
Arena gSystemArena;
-#if PLATFORM_N64
-#define DECLARE_INTERRUPT_MASK OSIntMask __mask;
-#define DISABLE_INTERRUPTS() __mask = osSetIntMask(OS_IM_NONE)
-#define RESTORE_INTERRUPTS() osSetIntMask(__mask)
-#else
-#define DECLARE_INTERRUPT_MASK
-#define DISABLE_INTERRUPTS() (void)0
-#define RESTORE_INTERRUPTS() (void)0
-#endif
-
#if OOT_DEBUG
s32 gSystemArenaLogSeverity = LOG_SEVERITY_NOLOG;
@@ -176,6 +167,6 @@ void SystemArena_Cleanup(void) {
__osMallocCleanup(&gSystemArena);
}
-u8 SystemArena_IsInitialized(void) {
+s32 SystemArena_IsInitialized(void) {
return __osMallocIsInitialized(&gSystemArena);
}