[ros-diffs] [jgardou] 58697: [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

Author: jgardou
Date: Sat Apr  6 22:38:00 2013
New Revision: 58697

URL: http://svn.reactos.org/svn/reactos?rev=58697&view=rev
Log:
[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

Modified:
    trunk/reactos/include/psdk/ks.h

Modified: trunk/reactos/include/psdk/ks.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=58697...
==============================================================================
--- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Sat Apr  6 22:38:00 2013
@@ -85,21 +85,9 @@
         #define DEFINE_GUIDSTRUCT(guid, name) struct __declspec(uuid(guid)) name
         #define DEFINE_GUIDNAMED(name) __uuidof(struct name)
     #else
-        extern "C++" {
-            template<typename T> 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)