Serge Gautherie : include: Remove remaining '&& !defined(CINTERFACE)' in guiddef.h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 34f3e7793b40d0eac60c373f66f262be2e0d5cdb
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=34f3e7793b40d0eac60c373f6...

Author: Serge Gautherie 
Date:   Mon Mar 30 07:29:30 2020 +0200

include: Remove remaining '&& !defined(CINTERFACE)' in guiddef.h.

Signed-off-by: Serge Gautherie 
Signed-off-by: Alexandre Julliard

---

include/guiddef.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/guiddef.h b/include/guiddef.h
index 9fc40c73eb..1871910efa 100644
--- a/include/guiddef.h
+++ b/include/guiddef.h
@@ -145,14 +145,14 @@ typedef GUID FMTID,*LPFMTID;
 #define REFCLSID            const CLSID &
 #define REFIID              const IID &
 #define REFFMTID            const FMTID &
-#else /* !defined(__cplusplus) */
+#else
 #define REFGUID             const GUID* __MIDL_CONST
 #define REFCLSID            const CLSID* __MIDL_CONST
 #define REFIID              const IID* __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)))
 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)[3] == ((ULONG *)&rguid2)[3]);
 }
-#else /* defined(__cplusplus) && !defined(CINTERFACE) */
+#else
 #define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID)))
 #define InlineIsEqualGUID(rguid1, rguid2)  \
         (((ULONG *)rguid1)[0] == ((ULONG *)rguid2)[0] && \
          ((ULONG *)rguid1)[1] == ((ULONG *)rguid2)[1] && \
          ((ULONG *)rguid1)[2] == ((ULONG *)rguid2)[2] && \
          ((ULONG *)rguid1)[3] == ((ULONG *)rguid2)[3])
-#endif /* defined(__cplusplus) && !defined(CINTERFACE) */
+#endif

-#if defined(__cplusplus) && !defined(CINTERFACE)
+#ifdef __cplusplus
 #include <string.h>
 inline bool operator==(const GUID& guidOne, const GUID& guidOther)
 {