diff options
| author | Luke Street <luke@street.dev> | 2026-02-28 14:35:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-28 13:35:07 -0800 |
| commit | b5d3b8c059c10711370437f7db7539cd90f1cb29 (patch) | |
| tree | 8e1ef45570cb137160ceb1f16fb3451d2a359544 /src/JSystem/JKernel/JKRFileLoader.cpp | |
| parent | 06ebc176c25f71ce2268755d6c0890a36e78d041 (diff) | |
Another round of GCC fixes (#3115)
* Fix remaining <string> -> <cstring> for GCC compilation (#3114 follow-up)
MWerks' <string> header transitively includes C string functions
(memcpy, strlen, strcmp, etc.), but GCC/Clang's <string> is the C++
std::string header. These files all use C string functions and should
include <cstring> instead.
* Use std::isnan instead of isnan for GCC compilation
GCC's <cmath> places isnan in the std namespace. Using the unqualified
isnan fails to compile with GCC/Clang.
* Fix cCcD_Src types: s32 -> u32 for bitmask fields
cCcD_SrcObjCommonBase::mSPrm, cCcD_SrcObjTg::mType, and
cCcD_SrcObjAt::mType are used as bitmasks (SetType/SetSPrm take u32,
MskType/MskSPrm use u32, values like 0xFFFFFFFF are common in
aggregate inits). Change from s32 to u32 to match usage.
Also fix AT_TYPE_WOLF_ATTACK/AT_TYPE_UNK to use unsigned literals,
and remove now-unnecessary (s32) casts on hex literals in collision
source data.
* Mark dummy() functions as static to avoid multiple definition errors
These decomp artifact functions have the same name and signature across
TUs, causing linker errors when building as a single binary.
Diffstat (limited to 'src/JSystem/JKernel/JKRFileLoader.cpp')
| -rw-r--r-- | src/JSystem/JKernel/JKRFileLoader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/JSystem/JKernel/JKRFileLoader.cpp b/src/JSystem/JKernel/JKRFileLoader.cpp index 26790f87b6..6bb460e93a 100644 --- a/src/JSystem/JKernel/JKRFileLoader.cpp +++ b/src/JSystem/JKernel/JKRFileLoader.cpp @@ -4,7 +4,7 @@ #define MSL_USE_INLINES 1 // needed to inline tolower call. not inlined elsewhere in the repo -#include <string> +#include <cstring> #include <cctype> #include "global.h" |