From 6a48380461bc9baabe1706ba57ca0cedfa2d0c51 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sat, 28 Feb 2026 21:19:17 -0700 Subject: More GCC compatibility/warning fixes (#3118) * Wrap >4-char literals in a MULTI_CHAR macro Modern compilers do not support CW's non-standard behavior with >4 char literals. We can, however, use a constexpr function to compute the u64 values directly. This leaves <=4 char literals unchanged. * Replace non-pointer usages of NULL with 0 * Define NULL to nullptr on C++11 and above * Fix more -Wpointer-arith and -Woverflow warnings * Replace u32/s32 with uintptr_t/intptr_t where appropriate * JSUOutputStream: Overload all standard int types --- src/JSystem/J3DGraphBase/J3DShape.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/JSystem/J3DGraphBase/J3DShape.cpp') diff --git a/src/JSystem/J3DGraphBase/J3DShape.cpp b/src/JSystem/J3DGraphBase/J3DShape.cpp index 91dd5b8ea0..1cf379df4e 100644 --- a/src/JSystem/J3DGraphBase/J3DShape.cpp +++ b/src/JSystem/J3DGraphBase/J3DShape.cpp @@ -226,7 +226,7 @@ void J3DShape::makeVtxArrayCmd() { if (array[i] != 0) GDSetArray((GXAttr)(i + GX_VA_POS), array[i], stride[i]); else - GDSetArrayRaw((GXAttr)(i + GX_VA_POS), NULL, stride[i]); + GDSetArrayRaw((GXAttr)(i + GX_VA_POS), 0, stride[i]); } } -- cgit v1.2.3