From f6b979ac3c57dcc788f57ce20a563bd06717f893 Mon Sep 17 00:00:00 2001 From: dbalatoni13 Date: Tue, 12 Nov 2024 19:29:11 +0100 Subject: [PATCH] Matched dolphin/OSAlloc.c --- configure.py | 2 +- src/dolphin/os/OSAlloc.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.py b/configure.py index 52215c30..f0e1d479 100644 --- a/configure.py +++ b/configure.py @@ -460,7 +460,7 @@ config.libs = [ [ Object(Matching, "dolphin/os/OS.c"), Object(Matching, "dolphin/os/OSAlarm.c"), - Object(NonMatching, "dolphin/os/OSAlloc.c"), + Object(Matching, "dolphin/os/OSAlloc.c"), Object(Matching, "dolphin/os/OSArena.c"), Object(Matching, "dolphin/os/OSAudioSystem.c"), Object(Matching, "dolphin/os/OSCache.c"), diff --git a/src/dolphin/os/OSAlloc.c b/src/dolphin/os/OSAlloc.c index fe0c34ae..32515afd 100644 --- a/src/dolphin/os/OSAlloc.c +++ b/src/dolphin/os/OSAlloc.c @@ -461,7 +461,9 @@ long OSCheckHeap(int heap) ASSERTREPORT(0x39A, cell->next == NULL || cell->next->prev == cell); ASSERTREPORT(0x39B, MINOBJSIZE <= cell->size); ASSERTREPORT(0x39C, OFFSET(cell->size, ALIGNMENT) == 0); - ASSERTREPORT(0x39D, cell->next == NULL || (char *)cell + cell->size < (char *)cell->next); + /* clang-format off*/ + ASSERTREPORT(0x39D, cell->next == NULL || (char*) cell + cell->size < (char*) cell->next); + /* clang-format on*/ total += cell->size; free = (cell->size + free); free -= HEADERSIZE;