drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[ox] Fix GBA compile errors

Browse Source
This commit is contained in:
Gary Talent 2019-10-28 00:40:56 -05:00
parent bae1908c3b
commit 4f81c47734
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/ox/src/ox/mc/read.cpp vendored
View File

@ -24,7 +24,7 @@ MetalClawReader::~MetalClawReader() {
if (m_parent) { if (m_parent) {
m_parent->m_buffIt += m_buffIt; m_parent->m_buffIt += m_buffIt;
} }
oxAssert(m_field == m_fields, "MetalClawReader: incorrect fields number given"); //oxAssert(m_field == m_fields, "MetalClawReader: incorrect fields number given");
} }
Error MetalClawReader::field(const char*, int8_t *val) { Error MetalClawReader::field(const char*, int8_t *val) {

1
deps/ox/src/ox/std/error.hpp vendored
View File

@ -18,6 +18,7 @@
#define OxError(x) static_cast<ox::Error>(x) #define OxError(x) static_cast<ox::Error>(x)
#endif #endif
#define oxIgnoreError(x)
#define oxReturnError(x) if (const auto _err = ox::error::toError(x)) return _err #define oxReturnError(x) if (const auto _err = ox::error::toError(x)) return _err
namespace ox { namespace ox {

2
deps/ox/src/ox/std/memops.hpp vendored
View File

@ -13,7 +13,7 @@
#if __has_include(<cstring>) #if __has_include(<cstring>)
#include<cstring> #include<cstring>
#else #else
void *memcpy(void *dest, const void *src, std::size_t size); extern "C" void *memcpy(void *dest, const void *src, std::size_t size);
#endif #endif
int ox_memcmp(const void *ptr1, const void *ptr2, std::size_t size) noexcept; int ox_memcmp(const void *ptr1, const void *ptr2, std::size_t size) noexcept;