From b5d3b8c059c10711370437f7db7539cd90f1cb29 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sat, 28 Feb 2026 14:35:07 -0700 Subject: Another round of GCC fixes (#3115) * Fix remaining -> for GCC compilation (#3114 follow-up) MWerks' header transitively includes C string functions (memcpy, strlen, strcmp, etc.), but GCC/Clang's is the C++ std::string header. These files all use C string functions and should include instead. * Use std::isnan instead of isnan for GCC compilation GCC's 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. --- src/d/d_error_msg.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/d/d_error_msg.cpp') diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp index 2436f983ea..460c794dbd 100644 --- a/src/d/d_error_msg.cpp +++ b/src/d/d_error_msg.cpp @@ -5,7 +5,7 @@ #include "d/dolzel.h" // IWYU pragma: keep -#include +#include #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/J2DGraph/J2DPicture.h" #include "JSystem/J2DGraph/J2DTextBox.h" -- cgit v1.2.3