From 594564028a1df105eef1527c7f20ed4d1ed919af Mon Sep 17 00:00:00 2001
From: LagoLunatic <LagoLunatic@users.noreply.github.com>
Date: Tue, 23 Dec 2025 15:47:39 -0500
Subject: [PATCH] Fix some clangd errors in headers

---
 .vscode/settings.json                         |  1 +
 include/JSystem/JGadget/linklist.h            |  4 ++++
 .../MetroTRK/Portable/mem_TRK.h               |  4 ++++
 .../MetroTRK/Portable/msgbuf.h                | 19 +++++++++++++++++++
 .../MetroTRK/Portable/mutex_TRK.h             |  1 +
 include/global.h                              |  1 +
 .../MetroTRK/Os/dolphin/dolphin_trk.c         |  1 +
 .../embedded/MetroTRK/Portable/msgbuf.c       |  1 +
 8 files changed, 32 insertions(+)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7ade75da5a0..a4ee63fb468 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -49,6 +49,7 @@
   "clangd.arguments": [
       "--function-arg-placeholders=0",
       "-header-insertion=never",
+      // "--log=verbose",
   ],
   "clangd.detectExtensionConflicts": true,
 }
diff --git a/include/JSystem/JGadget/linklist.h b/include/JSystem/JGadget/linklist.h
index 2fcb281f06b..47a438ddb8c 100644
--- a/include/JSystem/JGadget/linklist.h
+++ b/include/JSystem/JGadget/linklist.h
@@ -270,7 +270,11 @@ struct TLinkList_factory : public TLinkList<T, I> {
 
 template <typename T, int I>
 TLinkList_factory<T, I>::~TLinkList_factory() {
+#ifdef __MWERKS__
     JGADGET_ASSERTWARN(934, empty());
+#else
+    JGADGET_ASSERTWARN(934, this->empty());
+#endif
 }
 
 template <typename T>
diff --git a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h
index 740ce2cfdbc..135e1275b13 100644
--- a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h
+++ b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h
@@ -3,4 +3,8 @@
 
 #include "dolphin/types.h"
 
+void* TRK_memset(void* dest, int val, size_t count);
+void* TRK_memcpy(void* dest, const void* src, size_t count);
+void TRK_fill_mem(void* dest, int val, size_t count);
+
 #endif /* METROTRK_PORTABLE_MEM_TRK_H */
diff --git a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h
index d06794c1e70..ff14b432617 100644
--- a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h
+++ b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h
@@ -11,6 +11,25 @@ DSError TRKSetBufferPosition(TRKBuffer* msg, u32 pos);
 void* TRKGetBuffer(int);
 void TRKResetBuffer(TRKBuffer* msg, BOOL keepData);
 
+DSError TRKAppendBuffer1_ui16(TRKBuffer* buffer, const u16 data);
+DSError TRKAppendBuffer1_ui32(TRKBuffer* buffer, const u32 data);
+DSError TRKAppendBuffer1_ui64(TRKBuffer* buffer, const u64 data);
+
+DSError TRKAppendBuffer_ui8(TRKBuffer* buffer, const u8* data, int count);
+DSError TRKAppendBuffer_ui16(TRKBuffer* buffer, const u16* data, int count);
+DSError TRKAppendBuffer_ui32(TRKBuffer* buffer, const u32* data, int count);
+DSError TRKAppendBuffer_ui64(TRKBuffer* buffer, const u64* data, int count);
+
+DSError TRKReadBuffer1_ui8(TRKBuffer* buffer, u8* data);
+DSError TRKReadBuffer1_ui16(TRKBuffer* buffer, u16* data);
+DSError TRKReadBuffer1_ui32(TRKBuffer* buffer, u32* data);
+DSError TRKReadBuffer1_ui64(TRKBuffer* buffer, u64* data);
+
+DSError TRKReadBuffer_ui8(TRKBuffer* buffer, u8* data, int count);
+DSError TRKReadBuffer_ui16(TRKBuffer* buffer, u16* data, int count);
+DSError TRKReadBuffer_ui32(TRKBuffer* buffer, u32* data, int count);
+DSError TRKReadBuffer_ui64(TRKBuffer* buffer, u64* data, int count);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h
index 9f112f2e64b..d491ced0861 100644
--- a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h
+++ b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h
@@ -1,6 +1,7 @@
 #ifndef METROTRK_PORTABLE_MUTEX_TRK_H
 #define METROTRK_PORTABLE_MUTEX_TRK_H
 
+#include "revolution/types.h"
 
 u8 TRKReleaseMutex();
 u8 TRKAcquireMutex();
diff --git a/include/global.h b/include/global.h
index 4f2b7a60adb..ba03335425f 100644
--- a/include/global.h
+++ b/include/global.h
@@ -68,6 +68,7 @@
 // Silence clangd errors about MWCC PPC intrinsics by declaring them here.
 extern int __cntlzw(unsigned int);
 extern int __rlwimi(int, int, int, int, int);
+extern void __dcbf(void*, int);
 extern void __dcbz(void*, int);
 extern void __sync();
 extern int __abs(int);
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c
index 6bb12f9928c..d881cbad20f 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c
@@ -1,5 +1,6 @@
 #include "TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk.h"
 #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/main_TRK.h"
+#include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h"
 #include "TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.h"
 #include "TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.h"
 #include <dolphin/ar.h>
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c
index 55e298a88a2..2b94656ef13 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c
@@ -1,5 +1,6 @@
 #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h"
 #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.h"
+#include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h"
 
 TRKBuffer gTRKMsgBufs[3];