diff --git a/libobs/util/threading-windows.c b/libobs/util/threading-windows.c index 32419709d..e1df042c8 100644 --- a/libobs/util/threading-windows.c +++ b/libobs/util/threading-windows.c @@ -192,6 +192,9 @@ struct vs_threadname_info { void os_set_thread_name(const char *name) { +#ifdef __MINGW32__ + UNUSED_PARAMETER(name); +#else struct vs_threadname_info info; info.type = 0x1000; info.name = name; @@ -211,4 +214,5 @@ void os_set_thread_name(const char *name) } __except(EXCEPTION_EXECUTE_HANDLER) { #endif } +#endif } diff --git a/plugins/win-capture/graphics-hook/d3d9-patches.hpp b/plugins/win-capture/graphics-hook/d3d9-patches.hpp index 8226e6408..c16bfa4fa 100644 --- a/plugins/win-capture/graphics-hook/d3d9-patches.hpp +++ b/plugins/win-capture/graphics-hook/d3d9-patches.hpp @@ -20,14 +20,19 @@ static inline int safe_memcmp(const void *p1, const void *p2, size_t size) { +// Disabled exceptions on mingw-w64 as it is broken +#ifndef __MINGW32__ #ifdef NO_SEH_MINGW __try1(EXCEPTION_EXECUTE_HANDLER) #else __try +#endif #endif { return memcmp(p1, p2, size); } +// Disabled exceptions on mingw-w64 as it is broken +#ifndef __MINGW32__ #ifdef NO_SEH_MINGW __except1 #else @@ -36,7 +41,7 @@ static inline int safe_memcmp(const void *p1, const void *p2, size_t size) { return -1; } - +#endif } struct patch_info {