From ca42a3e9f5ca67635500de70f86c95da4bf10d96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Sat, 6 Apr 2013 22:38:00 +0000 Subject: [PATCH] [PSDK] * Don't be so complicated for defining the DEFINE_GUIDSTRUCT and DEFINE_GUIDNAMED macros on GCC CORE-7052 #comment fixed in 58697, thanks. #resolve svn path=/trunk/; revision=58697 --- reactos/include/psdk/ks.h | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/reactos/include/psdk/ks.h b/reactos/include/psdk/ks.h index 55d6c33b730..7653fa3fac2 100644 --- a/reactos/include/psdk/ks.h +++ b/reactos/include/psdk/ks.h @@ -85,21 +85,9 @@ typedef PVOID PKSWORKER; #define DEFINE_GUIDSTRUCT(guid, name) struct __declspec(uuid(guid)) name #define DEFINE_GUIDNAMED(name) __uuidof(struct name) #else - extern "C++" { - template const GUID &__mingw_uuidof(); - } - #define DEFINE_GUIDSTRUCT(guid, name) \ - struct __guid ## name; \ - extern "C++" { \ - template<> inline const GUID &__mingw_uuidof<__guid ## name>() { \ - static const IID iid = {STATICGUIDOF(name)}; \ - return iid; \ - } \ - template<> inline const GUID &__mingw_uuidof<__guid ## name *>() { \ - return __mingw_uuidof<__guid ## name>(); \ - } \ - } - #define DEFINE_GUIDNAMED(name) __mingw_uuidof<__guid ## name>() + #define DEFINE_GUIDSTRUCT(guid, name) \ + extern const DECLSPEC_SELECTANY GUID __uuid__##name={STATIC_##name}; + #define DEFINE_GUIDNAMED(name) __uuid__##name #endif #else #define DEFINE_GUIDSTRUCT(guid, name) DEFINE_GUIDEX(name)