mirror of
https://github.com/reactos/reactos.git
synced 2025-02-24 17:34:57 +00:00
[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
This commit is contained in:
parent
bffc9025eb
commit
ca42a3e9f5
1 changed files with 3 additions and 15 deletions
|
@ -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<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)
|
||||
|
|
Loading…
Reference in a new issue