diff --git a/soh/include/functions.h b/soh/include/functions.h index 11dbf8c811a..631cab7650f 100644 --- a/soh/include/functions.h +++ b/soh/include/functions.h @@ -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) diff --git a/soh/soh/GbiWrap.cpp b/soh/soh/GbiWrap.cpp index 1773c69c566..e210a292ffd 100644 --- a/soh/soh/GbiWrap.cpp +++ b/soh/soh/GbiWrap.cpp @@ -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; } diff --git a/soh/src/buffers/heaps.c b/soh/src/buffers/heaps.c index f54ffa3e0c9..de81705cb74 100644 --- a/soh/src/buffers/heaps.c +++ b/soh/src/buffers/heaps.c @@ -1,6 +1,6 @@ #include "z64.h" #include -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(__OpenBSD__) #include #endif #include