mirror of
https://github.com/zeldaret/oot
synced 2026-07-05 05:29:59 -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:
+4
-6
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user