mirror of
https://github.com/zeldaret/oot
synced 2026-05-24 15:21:04 -04:00
[ntsc-1.2] Match __osMalloc.c and code_800FC620.c (new/delete) (#2106)
* Match __osMalloc
* Match src/code/code_800FC620.c (new/delete)
* Wrap versions-specific files in ifdefs to fix compilation
* Fix bss
* Remove {FAULT,RAND,OSMALLOC}_VERSION in favor of PLATFORM_N64
* Fix __osMalloc data splits, add unused strings
* __osMalloc.h -> osMalloc.h
* Fix merge
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
#include "global.h"
|
||||
#include "osMalloc.h"
|
||||
|
||||
#define LOG_SEVERITY_NOLOG 0
|
||||
#define LOG_SEVERITY_ERROR 2
|
||||
@@ -125,6 +126,6 @@ void DebugArena_Cleanup(void) {
|
||||
__osMallocCleanup(&sDebugArena);
|
||||
}
|
||||
|
||||
u8 DebugArena_IsInitialized(void) {
|
||||
s32 DebugArena_IsInitialized(void) {
|
||||
return __osMallocIsInitialized(&sDebugArena);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user