Merge with upstream

3 files changed, 5 insertions, 3 deletions

diff --git a/include/dolphin/os/OSError.h b/include/dolphin/os/OSError.h
index ec07c81632..c2dcd5b9b8 100644
--- a/include/dolphin/os/OSError.h
+++ b/include/dolphin/os/OSError.h
@@ -51,6 +51,8 @@ typedef enum {
 typedef u8 __OSException;
 
 typedef void (*OSErrorHandler)(OSError error, OSContext* context, u32, u32);
+// Using this type for the C++ handlers makes stuff not match
+typedef void (*OSErrorHandlerEx)(OSError error, OSContext* context, u32, u32, ...);
 
 OSErrorHandler OSSetErrorHandler(OSError error, OSErrorHandler handler);
 void __OSUnhandledException(__OSException exception, OSContext* context, u32 dsisr, u32 dar);
diff --git a/include/dolphin/os/OSMutex.h b/include/dolphin/os/OSMutex.h
index 7e42c91bc4..0392c8dc5f 100644
--- a/include/dolphin/os/OSMutex.h
+++ b/include/dolphin/os/OSMutex.h
@@ -21,13 +21,13 @@ typedef struct OSCond {
 void OSInitMutex(OSMutex* mutex);
 void OSLockMutex(OSMutex* mutex);
 void OSUnlockMutex(OSMutex* mutex);
-s32 OSTryLockMutex(OSMutex* mutex);
+BOOL OSTryLockMutex(OSMutex* mutex);
 void OSInitCond(OSCond* cond);
 void OSWaitCond(OSCond* cond, OSMutex* mutex);
 void OSSignalCond(OSCond* cond);
 
 void __OSUnlockAllMutex(OSThread* thread);
-s32 __OSCheckMutex(OSThread* thread);
+BOOL __OSCheckMutex(OSMutex* thread);
 BOOL __OSCheckDeadLock(OSThread* thread);
 BOOL __OSCheckMutexes(OSThread* thread);
 
diff --git a/include/dolphin/os/OSThread.h b/include/dolphin/os/OSThread.h
index 40b9e134c1..b7009c7f04 100644
--- a/include/dolphin/os/OSThread.h
+++ b/include/dolphin/os/OSThread.h
@@ -44,8 +44,8 @@ struct OSThreadQueue {
 };
 
 struct OSMutexLink {
-    OSMutex* prev;
     OSMutex* next;
+    OSMutex* prev;
 };
 
 struct OSMutexQueue {