From 1a039a4729b9a8f0440739eec4cedf59e79a3aa0 Mon Sep 17 00:00:00 2001 From: Alpyne Date: Sat, 15 Jul 2023 20:53:41 +0200 Subject: [PATCH] [d3d8] Format MinGW __CRT_UUID_DECL definition --- src/d3d8/d3d8_include.h | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/d3d8/d3d8_include.h b/src/d3d8/d3d8_include.h index d824b1a73f0..63c43a3715b 100644 --- a/src/d3d8/d3d8_include.h +++ b/src/d3d8/d3d8_include.h @@ -65,19 +65,9 @@ interface DECLSPEC_UUID("4B8AAAFA-140F-42BA-9131-597EAFAA2EAD") IDirect3DVolumeT #ifdef __MINGW32__ #define __CRT_UUID_DECL(type,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \ } \ - extern "C++" { \ - template<> struct __mingw_uuidof_s { \ - static constexpr IID __uuid_inst = { \ - l,w1,w2, {b1,b2,b3,b4,b5,b6,b7,b8} \ - }; \ - }; \ - template<> constexpr const GUID &__mingw_uuidof() { \ - return __mingw_uuidof_s::__uuid_inst; \ - } \ - template<> constexpr const GUID &__mingw_uuidof() { \ - return __mingw_uuidof_s::__uuid_inst; \ - } \ - } \ + extern "C++" template<> struct __mingw_uuidof_s { static constexpr IID __uuid_inst = {l,w1,w2, {b1,b2,b3,b4,b5,b6,b7,b8}}; }; \ + extern "C++" template<> constexpr const GUID &__mingw_uuidof() { return __mingw_uuidof_s::__uuid_inst; } \ + extern "C++" template<> constexpr const GUID &__mingw_uuidof() { return __mingw_uuidof_s::__uuid_inst; } \ namespace d3d9 { #elif defined(__GNUC__)