diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2026-04-21 05:12:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-04-21 08:12:46 -0400 |
| commit | 57e41795f53f8d43d67e94f89b1b532e30cf8aec (patch) | |
| tree | b188e62dc98f6a0cace751c37f83236d5192afa5 /include/libc64 | |
| parent | fa85e7cda5de980151ab71279b6a1bf2eca9b23f (diff) | |
String macros (#1871)
* PRINTF
* T
* fault
* yaz0
* __osMalloc
* audio_thread_manager
* graph
* padmgr
* sched
* z_play
* z_arrow_ice
* z_arrow_light
* z_elf_msg
* z_elf_msg3
* z_elf_msg4
* z_elf_msg5
* z_mir_ray
* stackcheck
* Include versions in macros.h
* Fix workaround for permuter
Diffstat (limited to 'include/libc64')
| -rw-r--r-- | include/libc64/os_malloc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/libc64/os_malloc.h b/include/libc64/os_malloc.h index 575529e1a..3441a1d04 100644 --- a/include/libc64/os_malloc.h +++ b/include/libc64/os_malloc.h @@ -15,7 +15,7 @@ typedef struct ArenaNode { /* 0x4 */ size_t size; /* 0x8 */ struct ArenaNode* next; /* 0xC */ struct ArenaNode* prev; - #if MM_VERSION <= N64_JP_1_1 + #if MM_VERSION < N64_US /* 0x10 */ const char* filename; /* 0x14 */ int line; /* 0x18 */ OSId threadId; @@ -44,7 +44,7 @@ void* __osRealloc(Arena* arena, void* ptr, size_t newSize); void __osGetSizes(Arena* arena, size_t* outMaxFree, size_t* outFree, size_t* outAlloc); s32 __osCheckArena(Arena* arena); -#if MM_VERSION <= N64_JP_1_1 +#if MM_VERSION < N64_US void *__osMallocDebug(Arena *arena, size_t size, const char* file, int line); void *__osMallocRDebug(Arena *arena, size_t size, const char* file, int line); void __osFreeDebug(Arena* arena, void* ptr, const char* file, int line); |