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>

include: Remove remaining '&& !defined(CINTERFACE)' in guiddef.h.
34f3e779 · Serge Gautherie · Alexandre Julliard · 94ad6bd2 · 34f3e779
Commit 34f3e779 authored Mar 30, 2020 by Serge Gautherie Committed by Alexandre Julliard Mar 30, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

guiddef.h include/guiddef.h +6 -6

No files found.
--- 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)
 {