diff options
| author | cadmic <cadmic24@gmail.com> | 2024-09-04 02:10:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-04 11:10:14 +0200 |
| commit | c6d7cc7697c67989b1f018ae2bc934f6677c09b7 (patch) | |
| tree | cadb909a8c2adde978320b8505fc1bda48e3342c /src/code/fault_gc.c | |
| parent | af24970d8919e4e6bb8356fd5672c938582dfcb8 (diff) | |
[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
Diffstat (limited to 'src/code/fault_gc.c')
| -rw-r--r-- | src/code/fault_gc.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c index 587f7cb24..0402573ad 100644 --- a/src/code/fault_gc.c +++ b/src/code/fault_gc.c @@ -40,15 +40,11 @@ * DPad-Up may be pressed to enable sending fault pages over osSyncPrintf as well as displaying them on-screen. * DPad-Down disables sending fault pages over osSyncPrintf. */ +#if PLATFORM_GC + #pragma increment_block_number "gc-eu:240 gc-eu-mq:240 gc-eu-mq-dbg:224 gc-jp:240 gc-jp-ce:240 gc-jp-mq:240 gc-us:240" \ "gc-us-mq:240" -// Include versions.h first and redefine FAULT_VERSION -// This allows this file to compile even when versions.h uses FAULT_N64 -#include "versions.h" -#undef FAULT_VERSION -#define FAULT_VERSION FAULT_GC - #include "global.h" #include "alloca.h" #include "fault.h" @@ -1336,3 +1332,5 @@ NORETURN void Fault_AddHungupAndCrash(const char* file, int line) { sprintf(msg, "HungUp %s:%d", file, line); Fault_AddHungupAndCrashImpl(msg, NULL); } + +#endif |