include: Remove remaining '&& !defined(CINTERFACE)' in guiddef.h.
Signed-off-by: Serge Gautherie <winehq-git_serge_180711@gautherie.fr> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
94ad6bd2e6
commit
34f3e7793b
|
@ -145,14 +145,14 @@ typedef GUID FMTID,*LPFMTID;
|
||||||
#define REFCLSID const CLSID &
|
#define REFCLSID const CLSID &
|
||||||
#define REFIID const IID &
|
#define REFIID const IID &
|
||||||
#define REFFMTID const FMTID &
|
#define REFFMTID const FMTID &
|
||||||
#else /* !defined(__cplusplus) */
|
#else
|
||||||
#define REFGUID const GUID* __MIDL_CONST
|
#define REFGUID const GUID* __MIDL_CONST
|
||||||
#define REFCLSID const CLSID* __MIDL_CONST
|
#define REFCLSID const CLSID* __MIDL_CONST
|
||||||
#define REFIID const IID* __MIDL_CONST
|
#define REFIID const IID* __MIDL_CONST
|
||||||
#define REFFMTID const FMTID* __MIDL_CONST
|
#define REFFMTID const FMTID* __MIDL_CONST
|
||||||
#endif /* !defined(__cplusplus) */
|
#endif
|
||||||
|
|
||||||
#if defined(__cplusplus) && !defined(CINTERFACE)
|
#ifdef __cplusplus
|
||||||
#define IsEqualGUID(rguid1, rguid2) (!memcmp(&(rguid1), &(rguid2), sizeof(GUID)))
|
#define IsEqualGUID(rguid1, rguid2) (!memcmp(&(rguid1), &(rguid2), sizeof(GUID)))
|
||||||
inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2)
|
inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2)
|
||||||
{
|
{
|
||||||
|
@ -161,16 +161,16 @@ inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2)
|
||||||
((ULONG *)&rguid1)[2] == ((ULONG *)&rguid2)[2] &&
|
((ULONG *)&rguid1)[2] == ((ULONG *)&rguid2)[2] &&
|
||||||
((ULONG *)&rguid1)[3] == ((ULONG *)&rguid2)[3]);
|
((ULONG *)&rguid1)[3] == ((ULONG *)&rguid2)[3]);
|
||||||
}
|
}
|
||||||
#else /* defined(__cplusplus) && !defined(CINTERFACE) */
|
#else
|
||||||
#define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID)))
|
#define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID)))
|
||||||
#define InlineIsEqualGUID(rguid1, rguid2) \
|
#define InlineIsEqualGUID(rguid1, rguid2) \
|
||||||
(((ULONG *)rguid1)[0] == ((ULONG *)rguid2)[0] && \
|
(((ULONG *)rguid1)[0] == ((ULONG *)rguid2)[0] && \
|
||||||
((ULONG *)rguid1)[1] == ((ULONG *)rguid2)[1] && \
|
((ULONG *)rguid1)[1] == ((ULONG *)rguid2)[1] && \
|
||||||
((ULONG *)rguid1)[2] == ((ULONG *)rguid2)[2] && \
|
((ULONG *)rguid1)[2] == ((ULONG *)rguid2)[2] && \
|
||||||
((ULONG *)rguid1)[3] == ((ULONG *)rguid2)[3])
|
((ULONG *)rguid1)[3] == ((ULONG *)rguid2)[3])
|
||||||
#endif /* defined(__cplusplus) && !defined(CINTERFACE) */
|
#endif
|
||||||
|
|
||||||
#if defined(__cplusplus) && !defined(CINTERFACE)
|
#ifdef __cplusplus
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
inline bool operator==(const GUID& guidOne, const GUID& guidOther)
|
inline bool operator==(const GUID& guidOne, const GUID& guidOther)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue