Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion soh/include/functions.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ u32 Locale_IsRegionNative(void);
void _assert(const char* exp, const char* file, s32 line);
#elif defined(__linux__)
void __assert(const char* exp, const char* file, s32 line) __THROW;
#elif !defined(__APPLE__) && !defined(__SWITCH__)
#elif !defined(__APPLE__) && !defined(__SWITCH__) && !defined(__OpenBSD__)
void __assert(const char* exp, const char* file, s32 line);
#endif
#if defined(__APPLE__) && defined(NDEBUG)
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/GbiWrap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ extern "C" void gSPSegment(void* value, int segNum, uintptr_t target) {
if (res) {
uintptr_t desiredTarget = (uintptr_t)ResourceMgr_LoadIfDListByName(imgData);

if (desiredTarget != NULL)
if (desiredTarget)
target = desiredTarget;
}

Expand Down
2 changes: 1 addition & 1 deletion soh/src/buffers/heaps.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "z64.h"
#include <assert.h>
#ifndef __APPLE__
#if !defined(__APPLE__) && !defined(__OpenBSD__)
#include <malloc.h>
#endif
#include <stdlib.h>
Expand Down
Loading